Fixes.

jphp-group · May 2, 2018 · 5be4901 · 5be4901
1 parent 79bf5cd
commit 5be4901
Show file tree

Hide file tree

Showing 75 changed files with 90 additions and 88 deletions.
diff --git a/build.gradle b/build.gradle
@@ -46,16 +46,16 @@ allprojects {
     configurations {
         provided
         jppmCompile
-        java9
+        compileMaven
     }
 
     sourceSets {
         main {
-            compileClasspath += configurations.provided + configurations.jppmCompile
+            compileClasspath += configurations.provided + configurations.jppmCompile + configurations.compileMaven
         }
 
         test {
-            compileClasspath += configurations.provided + configurations.jppmCompile
+            compileClasspath += configurations.provided + configurations.jppmCompile + configurations.compileMaven
         }
     }
 }
@@ -66,6 +66,8 @@ configure(subprojects) {
 
     if (it.name.endsWith("-ext") || it.name.startsWith("jphp-")) {
         apply plugin: 'maven'
+
+        install.repositories.mavenInstaller.pom.scopeMappings.addMapping(100, configurations.compileMaven, 'compile')
     }
 
     apply plugin: 'com.github.johnrengelman.shadow'
@@ -103,7 +105,7 @@ configure(subprojects) {
             workingDir = project.projectDir
         }
 
-        task hubPublish(type: Exec, dependsOn: docBuild) {
+        task hubPublish(type: Exec, dependsOn: [docBuild, jar]) {
             def cmdArgs = ['jppm', 'hub:publish', '-yes', '-force']
 
             if (System.getProperty("os.name").toLowerCase().contains("windows")) {
@@ -136,7 +138,12 @@ configure(subprojects) {
         def pr = it
 
         install {
+
             repositories.mavenInstaller {
+                configurations.compileMaven.allDependencies.each { dep ->
+                    //pom.dependencies.add(dep)
+                }
+
                 if (pr.name.startsWith(extDir)) {
                     pom.artifactId = pr.name.substring(extDir.length())
                 }
@@ -147,7 +154,6 @@ configure(subprojects) {
 
         [installer]*.pom*.whenConfigured { pom ->
             pom.dependencies.each { dep ->
-
                 if (dep.artifactId.startsWith(extDir)) {
                     dep.artifactId = dep.artifactId.substring(extDir.length())
                 }

diff --git a/exts/jphp-compress-ext/api-docs/README.md b/exts/jphp-compress-ext/api-docs/README.md
@@ -3,7 +3,7 @@
 ---
 
 ## jphp-compress-ext
-> version 1.0.0, created by JPPM v0.2.0
+> version 1.0.0, created by JPPM.
 
 Compress library, supports tar, bz2, gz, zip and lz4 formats.
 

diff --git a/exts/jphp-compress-ext/api-docs/README.ru.md b/exts/jphp-compress-ext/api-docs/README.ru.md
@@ -3,7 +3,7 @@
 ---
 
 ## jphp-compress-ext
-> версия 1.0.0, создано с помощью JPPM v0.2.0
+> версия 1.0.0, создано с помощью JPPM.
 
 Compress library, supports tar, bz2, gz, zip and lz4 formats.
 

diff --git a/exts/jphp-crypto-ext/api-docs/README.md b/exts/jphp-crypto-ext/api-docs/README.md
@@ -3,7 +3,7 @@
 ---
 
 ## jphp-crypto-ext
-> version 1.0.0, created by JPPM v0.2.0
+> version 1.0.0, created by JPPM.
 
 Crypto Library.
 

diff --git a/exts/jphp-crypto-ext/api-docs/README.ru.md b/exts/jphp-crypto-ext/api-docs/README.ru.md
@@ -3,7 +3,7 @@
 ---
 
 ## jphp-crypto-ext
-> версия 1.0.0, создано с помощью JPPM v0.2.0
+> версия 1.0.0, создано с помощью JPPM.
 
 Crypto Library.
 

diff --git a/exts/jphp-firebirdsql-ext/api-docs/README.md b/exts/jphp-firebirdsql-ext/api-docs/README.md
@@ -3,7 +3,7 @@
 ---
 
 ## jphp-firebirdsql-ext
-> version 1.0.0, created by JPPM v0.2.0
+> version 1.0.0, created by JPPM.
 
 Library for working with FireBird SQL database.
 

diff --git a/exts/jphp-firebirdsql-ext/api-docs/README.ru.md b/exts/jphp-firebirdsql-ext/api-docs/README.ru.md
@@ -3,7 +3,7 @@
 ---
 
 ## jphp-firebirdsql-ext
-> версия 1.0.0, создано с помощью JPPM v0.2.0
+> версия 1.0.0, создано с помощью JPPM.
 
 Library for working with FireBird SQL database.
 

diff --git a/exts/jphp-firebirdsql-ext/build.gradle b/exts/jphp-firebirdsql-ext/build.gradle
@@ -1,6 +1,6 @@
 dependencies {
     provided project(":jphp-runtime")
-    compile project(":exts/jphp-sql-ext")
+    compileMaven project(":exts/jphp-sql-ext")
 
     // dependencies ....
     compile group: 'org.firebirdsql.jdbc', name: 'jaybird-jdk18', version: '3.0.1'

diff --git a/exts/jphp-git-ext/api-docs/README.md b/exts/jphp-git-ext/api-docs/README.md
@@ -3,7 +3,7 @@
 ---
 
 ## jphp-git-ext
-> version 1.0.0, created by JPPM v0.2.0
+> version 1.0.0, created by JPPM.
 
 Git VCS Library.
 

diff --git a/exts/jphp-git-ext/api-docs/README.ru.md b/exts/jphp-git-ext/api-docs/README.ru.md
@@ -3,7 +3,7 @@
 ---
 
 ## jphp-git-ext
-> версия 1.0.0, создано с помощью JPPM v0.2.0
+> версия 1.0.0, создано с помощью JPPM.
 
 Git VCS Library.
 

diff --git a/exts/jphp-graphic-ext/api-docs/README.md b/exts/jphp-graphic-ext/api-docs/README.md
@@ -3,7 +3,7 @@
 ---
 
 ## jphp-graphic-ext
-> version 1.0.0, created by JPPM v0.2.0
+> version 1.0.0, created by JPPM.
 
 Graphic library like GD in zend php.
 

diff --git a/exts/jphp-graphic-ext/api-docs/README.ru.md b/exts/jphp-graphic-ext/api-docs/README.ru.md
@@ -3,7 +3,7 @@
 ---
 
 ## jphp-graphic-ext
-> версия 1.0.0, создано с помощью JPPM v0.2.0
+> версия 1.0.0, создано с помощью JPPM.
 
 Graphic library like GD in zend php.
 

diff --git a/exts/jphp-gui-desktop-ext/api-docs/README.md b/exts/jphp-gui-desktop-ext/api-docs/README.md
@@ -3,7 +3,7 @@
 ---
 
 ## jphp-gui-desktop-ext
-> version 1.0.0, created by JPPM v0.2.0
+> version 1.0.0, created by JPPM.
 
 Desktop features.
 

diff --git a/exts/jphp-gui-desktop-ext/api-docs/README.ru.md b/exts/jphp-gui-desktop-ext/api-docs/README.ru.md
@@ -3,7 +3,7 @@
 ---
 
 ## jphp-gui-desktop-ext
-> версия 1.0.0, создано с помощью JPPM v0.2.0
+> версия 1.0.0, создано с помощью JPPM.
 
 Desktop features.
 

diff --git a/exts/jphp-gui-ext/api-docs/README.md b/exts/jphp-gui-ext/api-docs/README.md
@@ -3,7 +3,7 @@
 ---
 
 ## jphp-gui-ext
-> version 1.0.0, created by JPPM v0.2.0
+> version 1.0.0, created by JPPM.
 
 GUI based on JavaFX library.
 

diff --git a/exts/jphp-gui-ext/api-docs/README.ru.md b/exts/jphp-gui-ext/api-docs/README.ru.md
@@ -3,7 +3,7 @@
 ---
 
 ## jphp-gui-ext
-> версия 1.0.0, создано с помощью JPPM v0.2.0
+> версия 1.0.0, создано с помощью JPPM.
 
 GUI based on JavaFX library.
 

diff --git a/exts/jphp-gui-ext/build.gradle b/exts/jphp-gui-ext/build.gradle
@@ -2,6 +2,6 @@ dependencies {
     provided project(":jphp-runtime")
 
     provided project(":jphp-core")
-    compile project(":exts/jphp-xml-ext")
-    compile project(":exts/jphp-graphic-ext")
+    compileMaven project(":exts/jphp-xml-ext")
+    compileMaven project(":exts/jphp-graphic-ext")
 }
diff --git a/exts/jphp-gui-game-ext/api-docs/README.md b/exts/jphp-gui-game-ext/api-docs/README.md
@@ -3,7 +3,7 @@
 ---
 
 ## jphp-gui-game-ext
-> version 1.0.0, created by JPPM v0.2.0
+> version 1.0.0, created by JPPM.
 
 Game Addon for GUI JavaFX library.
 

diff --git a/exts/jphp-gui-game-ext/api-docs/README.ru.md b/exts/jphp-gui-game-ext/api-docs/README.ru.md
@@ -3,7 +3,7 @@
 ---
 
 ## jphp-gui-game-ext
-> версия 1.0.0, создано с помощью JPPM v0.2.0
+> версия 1.0.0, создано с помощью JPPM.
 
 Game Addon for GUI JavaFX library.
 

diff --git a/exts/jphp-gui-jfoenix-ext/api-docs/README.md b/exts/jphp-gui-jfoenix-ext/api-docs/README.md
@@ -3,7 +3,7 @@
 ---
 
 ## jphp-gui-jfoenix-ext
-> version 1.0.0, created by JPPM v0.2.0
+> version 1.0.0, created by JPPM.
 
 Material UI components for JavaFX.
 

diff --git a/exts/jphp-gui-jfoenix-ext/api-docs/README.ru.md b/exts/jphp-gui-jfoenix-ext/api-docs/README.ru.md
@@ -3,7 +3,7 @@
 ---
 
 ## jphp-gui-jfoenix-ext
-> версия 1.0.0, создано с помощью JPPM v0.2.0
+> версия 1.0.0, создано с помощью JPPM.
 
 Material UI components for JavaFX.
 

diff --git a/exts/jphp-gui-systemtray-ext/api-docs/README.md b/exts/jphp-gui-systemtray-ext/api-docs/README.md
@@ -3,7 +3,7 @@
 ---
 
 ## jphp-gui-systemtray-ext
-> version 1.0.0, created by JPPM v0.2.0
+> version 1.0.0, created by JPPM.
 
 GUI System Tray.
 

diff --git a/exts/jphp-gui-systemtray-ext/api-docs/README.ru.md b/exts/jphp-gui-systemtray-ext/api-docs/README.ru.md
@@ -3,7 +3,7 @@
 ---
 
 ## jphp-gui-systemtray-ext
-> версия 1.0.0, создано с помощью JPPM v0.2.0
+> версия 1.0.0, создано с помощью JPPM.
 
 GUI System Tray.
 

diff --git a/exts/jphp-httpclient-ext/api-docs/README.md b/exts/jphp-httpclient-ext/api-docs/README.md
@@ -3,7 +3,7 @@
 ---
 
 ## jphp-httpclient-ext
-> version 1.0.0, created by JPPM v0.2.0
+> version 1.0.0, created by JPPM.
 
 Http Client library.
 

diff --git a/exts/jphp-httpclient-ext/api-docs/README.ru.md b/exts/jphp-httpclient-ext/api-docs/README.ru.md
@@ -3,7 +3,7 @@
 ---
 
 ## jphp-httpclient-ext
-> версия 1.0.0, создано с помощью JPPM v0.2.0
+> версия 1.0.0, создано с помощью JPPM.
 
 Http Client library.
 

diff --git a/exts/jphp-httpserver-ext/api-docs/README.md b/exts/jphp-httpserver-ext/api-docs/README.md
@@ -3,7 +3,7 @@
 ---
 
 ## jphp-httpserver-ext
-> version 1.0.0, created by JPPM v0.2.0
+> version 1.0.0, created by JPPM.
 
 
 ### Install

diff --git a/exts/jphp-httpserver-ext/api-docs/README.ru.md b/exts/jphp-httpserver-ext/api-docs/README.ru.md
@@ -3,7 +3,7 @@
 ---
 
 ## jphp-httpserver-ext
-> версия 1.0.0, создано с помощью JPPM v0.2.0
+> версия 1.0.0, создано с помощью JPPM.
 
 
 ### Установка

diff --git a/exts/jphp-json-ext/api-docs/README.md b/exts/jphp-json-ext/api-docs/README.md
@@ -3,7 +3,7 @@
 ---
 
 ## jphp-json-ext
-> version 1.0.0, created by JPPM v0.2.0
+> version 1.0.0, created by JPPM.
 
 Parse and format JSON.
 

diff --git a/exts/jphp-json-ext/api-docs/README.ru.md b/exts/jphp-json-ext/api-docs/README.ru.md
@@ -3,7 +3,7 @@
 ---
 
 ## jphp-json-ext
-> версия 1.0.0, создано с помощью JPPM v0.2.0
+> версия 1.0.0, создано с помощью JPPM.
 
 Parse and format JSON.
 

diff --git a/exts/jphp-jsoup-ext/api-docs/README.md b/exts/jphp-jsoup-ext/api-docs/README.md
@@ -3,7 +3,7 @@
 ---
 
 ## jphp-jsoup-ext
-> version 1.0.0, created by JPPM v0.2.0
+> version 1.0.0, created by JPPM.
 
 Parsing html like in jQuery.
 

diff --git a/exts/jphp-jsoup-ext/api-docs/README.ru.md b/exts/jphp-jsoup-ext/api-docs/README.ru.md
@@ -3,7 +3,7 @@
 ---
 
 ## jphp-jsoup-ext
-> версия 1.0.0, создано с помощью JPPM v0.2.0
+> версия 1.0.0, создано с помощью JPPM.
 
 Parsing html like in jQuery.
 

diff --git a/exts/jphp-mail-ext/api-docs/README.md b/exts/jphp-mail-ext/api-docs/README.md
@@ -3,7 +3,7 @@
 ---
 
 ## jphp-mail-ext
-> version 1.0.0, created by JPPM v0.2.0
+> version 1.0.0, created by JPPM.
 
 Library for sending email via SMTP servers.
 

diff --git a/exts/jphp-mail-ext/api-docs/README.ru.md b/exts/jphp-mail-ext/api-docs/README.ru.md
@@ -3,7 +3,7 @@
 ---
 
 ## jphp-mail-ext
-> версия 1.0.0, создано с помощью JPPM v0.2.0
+> версия 1.0.0, создано с помощью JPPM.
 
 Library for sending email via SMTP servers.
 

diff --git a/exts/jphp-markdown-ext/api-docs/README.md b/exts/jphp-markdown-ext/api-docs/README.md
@@ -3,7 +3,7 @@
 ---
 
 ## jphp-markdown-ext
-> version 1.0.0, created by JPPM v0.2.0
+> version 1.0.0, created by JPPM.
 
 Library for convert markdown to HTML.
 

diff --git a/exts/jphp-markdown-ext/api-docs/README.ru.md b/exts/jphp-markdown-ext/api-docs/README.ru.md
@@ -3,7 +3,7 @@
 ---
 
 ## jphp-markdown-ext
-> версия 1.0.0, создано с помощью JPPM v0.2.0
+> версия 1.0.0, создано с помощью JPPM.
 
 Library for convert markdown to HTML.
 

diff --git a/exts/jphp-mongo-ext/api-docs/README.md b/exts/jphp-mongo-ext/api-docs/README.md
@@ -3,7 +3,7 @@
 ---
 
 ## jphp-mongo-ext
-> version 1.0.0, created by JPPM v0.2.0
+> version 1.0.0, created by JPPM.
 
 Library for working with MongoDB.
 

diff --git a/exts/jphp-mongo-ext/api-docs/README.ru.md b/exts/jphp-mongo-ext/api-docs/README.ru.md
@@ -3,7 +3,7 @@
 ---
 
 ## jphp-mongo-ext
-> версия 1.0.0, создано с помощью JPPM v0.2.0
+> версия 1.0.0, создано с помощью JPPM.
 
 Library for working with MongoDB.
 

diff --git a/exts/jphp-mysql-ext/api-docs/README.md b/exts/jphp-mysql-ext/api-docs/README.md
@@ -3,7 +3,7 @@
 ---
 
 ## jphp-mysql-ext
-> version 1.0.0, created by JPPM v0.2.0
+> version 1.0.0, created by JPPM.
 
 Library for working with MySQL database.