Merge remote-tracking branch 'origin/master'

configuration/pom.xml

@@ -24,7 +24,7 @@ limitations under the License.
     <parent>
         <artifactId>shared</artifactId>
         <groupId>de.muehlencord</groupId>
-        <version>1.2-SNAPSHOT</version>
+        <version>1.2</version>
     </parent>    
 
     <name>shared-configuration</name>

db/pom.xml

@@ -15,8 +15,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
   <groupId>de.muehlencord.shared</groupId>
@@ -26,7 +25,7 @@ limitations under the License.
   <parent>
     <artifactId>shared</artifactId>
     <groupId>de.muehlencord</groupId>
-    <version>1.2-SNAPSHOT</version>
+    <version>1.2</version>
   </parent>
 
   <name>shared-db</name>

jeeutil/pom.xml

@@ -20,7 +20,7 @@ limitations under the License.
     <parent>
         <artifactId>shared</artifactId>
         <groupId>de.muehlencord</groupId>
-        <version>1.2-SNAPSHOT</version>
+        <version>1.2</version>
     </parent>
 
     <groupId>de.muehlencord.shared</groupId>

network/pom.xml

@@ -13,8 +13,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
 -->
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <artifactId>shared-network</artifactId>
 
   <build>
@@ -73,7 +72,7 @@ limitations under the License.
   <parent>
     <artifactId>shared</artifactId>
     <groupId>de.muehlencord</groupId>
-    <version>1.2-SNAPSHOT</version>
+    <version>1.2</version>
   </parent>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -81,5 +80,5 @@ limitations under the License.
 
   <url>http://maven.apache.org</url>
 
-  <version>1.2-SNAPSHOT</version>
+  <version>1.2</version>
 </project>

poi-util/pom.xml

@@ -15,8 +15,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <artifactId>shared-poi-util</artifactId>
 
   <dependencies>
@@ -48,9 +47,9 @@ limitations under the License.
   <parent>
     <artifactId>shared</artifactId>
     <groupId>de.muehlencord</groupId>
-    <version>1.2-SNAPSHOT</version>
+    <version>1.2</version>
   </parent>
 
 
-  <version>1.2-SNAPSHOT</version>
+  <version>1.2</version>
 </project>

pom.xml

@@ -15,12 +15,11 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
   <artifactId>shared</artifactId>
-  <version>1.2-SNAPSHOT</version>
+  <version>1.2</version>
   <name>shared</name>
   <packaging>pom</packaging>
 
@@ -50,9 +49,9 @@ limitations under the License.
   </developers>
 
   <scm>
-    <connection>scm:git:https://jomu.timelord.de/git/jomu/shared/</connection>
+    <connection>scm:git:git@jomu.timelord.de:jomu/shared.git</connection>
-    <developerConnection>scm:git:https://jomu.timelord.de/git/jomu/shared/</developerConnection>
+    <developerConnection>scm:git:git@jomu.timelord.de:jomu/shared.git</developerConnection>
-    <tag>HEAD</tag>
+    <tag>v1.2</tag>
     <url>https://jomu.timelord.de/git/jomu/shared/</url>
   </scm>
 

shiro-faces/pom.xml

@@ -1,45 +1,45 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
-<!--
+<!--
-Copyright 2019 Joern Muehlencord (joern@muehlencord.de).
+Copyright 2019 Joern Muehlencord (joern@muehlencord.de).
-
+
-Licensed under the Apache License, Version 2.0 (the "License");
+Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
+you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
+You may obtain a copy of the License at
-
+
-     http://www.apache.org/licenses/LICENSE-2.0
+     http://www.apache.org/licenses/LICENSE-2.0
-
+
-Unless required by applicable law or agreed to in writing, software
+Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
+distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
+See the License for the specific language governing permissions and
-limitations under the License.
+limitations under the License.
--->
+-->
-
+
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
+    <modelVersion>4.0.0</modelVersion>
-    <groupId>de.muehlencord.shared</groupId>
+    <groupId>de.muehlencord.shared</groupId>
-    <artifactId>shared-shiro-faces</artifactId>
+    <artifactId>shared-shiro-faces</artifactId>
-    <packaging>jar</packaging>
+    <packaging>jar</packaging>
-        
+        
-    <parent>
+    <parent>
-        <groupId>de.muehlencord</groupId>
+        <groupId>de.muehlencord</groupId>
-        <artifactId>shared</artifactId>
+        <artifactId>shared</artifactId>
-        <version>1.2-SNAPSHOT</version>
+        <version>1.2</version>
-    </parent>
+    </parent>
-    
+    
-    <name>shared-shiro-faces</name>
+    <name>shared-shiro-faces</name>
-      
+      
-    <dependencies>
+    <dependencies>
-        <dependency>
+        <dependency>
-            <groupId>org.apache.shiro</groupId>
+            <groupId>org.apache.shiro</groupId>
-            <artifactId>shiro-web</artifactId>
+            <artifactId>shiro-web</artifactId>
-            <scope>provided</scope>
+            <scope>provided</scope>
-        </dependency>
+        </dependency>
-        <dependency>
+        <dependency>
-            <groupId>javax</groupId>
+            <groupId>javax</groupId>
-            <artifactId>javaee-api</artifactId>
+            <artifactId>javaee-api</artifactId>
-            <scope>provided</scope>
+            <scope>provided</scope>
-        </dependency>
+        </dependency>
-    </dependencies>    
+    </dependencies>    
-     
+     
 </project>

util/pom.xml

@@ -26,7 +26,7 @@ limitations under the License.
     <parent>
         <artifactId>shared</artifactId>
         <groupId>de.muehlencord</groupId>
-        <version>1.2-SNAPSHOT</version>
+        <version>1.2</version>
     </parent>