Had fight with maven. It decided to block HTTP repositories.

[meviz.git] / pom.xml

diff --git a/pom.xml b/pom.xml
index 02b8fda..cfea716 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -2,33 +2,21 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>eu.svjatoslav</groupId>
     <artifactId>meviz</artifactId>
-    <version>1.2-SNAPSHOT</version>
+    <version>1.5-SNAPSHOT</version>
     <packaging>jar</packaging>
     <name>meviz</name>
     <description>media wizard</description>
 
     <organization>
         <name>svjatoslav.eu</name>
-        <url>http://svjatoslav.eu</url>
+        <url>https://svjatoslav.eu</url>
     </organization>
 
-    <dependencies>
-        <dependency>
-            <groupId>eu.svjatoslav</groupId>
-            <artifactId>svjatoslavcommons</artifactId>
-            <version>1.7</version>
-        </dependency>
-        <dependency>
-            <groupId>log4j</groupId>
-            <artifactId>log4j</artifactId>
-            <version>1.2.16</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tika</groupId>
-            <artifactId>tika-core</artifactId>
-            <version>1.18</version>
-        </dependency>
-    </dependencies>
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+    </properties>
+
 
     <build>
         <plugins>
@@ -71,10 +59,10 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>2.3.2</version>
+                <version>3.8.1</version>
                 <configuration>
-                    <source>1.8</source>
-                    <target>1.8</target>
+                    <source>8</source>
+                    <target>8</target>
                     <encoding>UTF-8</encoding>
                 </configuration>
             </plugin>
@@ -96,7 +84,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-javadoc-plugin</artifactId>
-                <version>2.9</version>
+                <version>2.10.4</version>
                 <executions>
                     <execution>
                         <id>attach-javadocs</id>
@@ -105,6 +93,17 @@
                         </goals>
                     </execution>
                 </executions>
+                <configuration>
+                    <!-- workaround for https://bugs.openjdk.java.net/browse/JDK-8212233 -->
+                    <javaApiLinks>
+                        <property>
+                            <name>foo</name>
+                            <value>bar</value>
+                        </property>
+                    </javaApiLinks>
+                    <!-- Workaround for https://stackoverflow.com/questions/49472783/maven-is-unable-to-find-javadoc-command -->
+                    <javadocExecutable>${java.home}/bin/javadoc</javadocExecutable>
+                </configuration>
             </plugin>
 
             <plugin>
@@ -131,6 +130,44 @@
         </extensions>
     </build>
 
+    <dependencies>
+        <dependency>
+            <groupId>eu.svjatoslav</groupId>
+            <artifactId>svjatoslavcommons</artifactId>
+            <version>1.9</version>
+        </dependency>
+        <dependency>
+            <groupId>eu.svjatoslav</groupId>
+            <artifactId>cli-helper</artifactId>
+            <version>1.0</version>
+        </dependency>
+        <dependency>
+            <groupId>log4j</groupId>
+            <artifactId>log4j</artifactId>
+            <version>1.2.16</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tika</groupId>
+            <artifactId>tika-core</artifactId>
+            <version>1.18</version>
+        </dependency>
+        <dependency>
+            <groupId>org.openimaj</groupId>
+            <artifactId>core-image</artifactId>
+            <version>1.3.10</version>
+        </dependency>
+        <dependency>
+            <groupId>org.sejda.imageio</groupId>
+            <artifactId>webp-imageio</artifactId>
+            <version>0.1.6</version>
+        </dependency>
+<!--        <dependency>-->
+<!--            <groupId>org.scijava</groupId>-->
+<!--            <artifactId>native-lib-loader</artifactId>-->
+<!--            <version>2.3.5</version>-->
+<!--        </dependency>-->
+    </dependencies>
+
     <distributionManagement>
         <snapshotRepository>
             <id>svjatoslav.eu</id>
@@ -145,16 +182,16 @@
     </distributionManagement>
 
     <scm>
-        <connection>scm:git:ssh://gitprivate@svjatoslav.eu/home/gitprivate/repositories/meviz.git</connection>
-        <developerConnection>scm:git:ssh://gitprivate@svjatoslav.eu/home/gitprivate/repositories/meviz.git
-        </developerConnection>
+        <connection>scm:git:ssh://n0@svjatoslav.eu:10006/home/n0/git/meviz.git</connection>
+        <developerConnection>scm:git:ssh://n0@svjatoslav.eu:10006/home/n0/git/meviz.git</developerConnection>
+        <tag>HEAD</tag>
     </scm>
 
     <repositories>
         <repository>
             <id>svjatoslav.eu</id>
             <name>Svjatoslav repository</name>
-            <url>http://www2.svjatoslav.eu/maven/</url>
+            <url>https://www3.svjatoslav.eu/maven/</url>
 
             <releases>
                 <enabled>true</enabled>