Skip to content

Commit

Permalink
ReadJDBC and WriteJDBC reverted to no longer use dynamic load and ref…
Browse files Browse the repository at this point in the history
…lection
  • Loading branch information
jpaulm committed Oct 31, 2020
1 parent 2ded521 commit e7fbc32
Show file tree
Hide file tree
Showing 25 changed files with 186 additions and 425 deletions.
18 changes: 8 additions & 10 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -26,14 +26,13 @@ allprojects {
apply plugin: 'java'
apply plugin: 'eclipse'
apply plugin: 'application'
//apply plugin: 'maven'
apply plugin: 'maven-publish'
apply plugin: 'signing'
apply plugin: 'java-library'

}

version = '4.1.9'
version = '4.1.11'

group = 'com.jpaulmorrison'

Expand Down Expand Up @@ -62,9 +61,8 @@ repositories {


dependencies {
implementation ('com.google.code.gson:gson:2.8.6')
//implementation ('mysql:mysql-connector-java:8.0.21')

compileOnly 'com.google.code.gson:gson:2.8.6'
compileOnly 'mysql:mysql-connector-java:8.0.22'
}

java {
Expand All @@ -86,11 +84,11 @@ jar {
archiveBaseName = project.name
from sourceSets.main.output

dependsOn configurations.compileClasspath
//dependsOn configurations.compileClasspath

from {
configurations.compileClasspath.findAll { it.name.endsWith('jar') }.collect { zipTree(it) }
}
// from {
// configurations.compileClasspath.findAll { it.name.endsWith('jar') }.collect { zipTree(it) }
// }


}
Expand Down Expand Up @@ -137,7 +135,7 @@ description = "Create default maven directory structure"

groupId = 'com.jpaulmorrison'
artifactId = 'javafbp'
version = '4.1.9'
version = '4.1.11'

from components.java

Expand Down
Binary file added build/distributions/javafbp-4.1.10.tar
Binary file not shown.
Binary file added build/distributions/javafbp-4.1.10.zip
Binary file not shown.
Binary file added build/distributions/javafbp-4.1.11.tar
Binary file not shown.
Binary file added build/distributions/javafbp-4.1.11.zip
Binary file not shown.
Binary file added build/libs/javafbp-4.1.10-javadoc.jar
Binary file not shown.
11 changes: 11 additions & 0 deletions build/libs/javafbp-4.1.10-javadoc.jar.asc
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
-----BEGIN PGP SIGNATURE-----
Version: BCPG v1.64

iQEcBAABCgAGBQJfnZIHAAoJEIoqalWqx6keqBYH/1CSGgN+Ljy4xJe5U+77rpFw
9XaQHDP5StT2QG6DCoZ3lsN3n8RspcTlqlyqYWqVDNpm7R9goRIhd12zeFy97KTV
zO4BbnPovauw+WLTL3BVUC8XDEIlXdkZpy4JK5i66BqNIqznYmCrtQybd/b1sfwU
FZrCHqsMEIqYnjDEpv4gauNd/FQExrpHVSSxv0bv7p5rF/MI3/xniFJ2TlvR1DRi
P7eMvjOqo3JNAfT9YFozXK1ezbHH/hZssCtAPugUt2LZxbTecd/y4YYQkdv49K4E
cYLe0FxwwNNe5Gfzmnd3fRVOTskOfBRA1wN4TagaGEXlsUKws93THcBcrdEaMs4=
=EtcJ
-----END PGP SIGNATURE-----
Binary file added build/libs/javafbp-4.1.10-sources.jar
Binary file not shown.
11 changes: 11 additions & 0 deletions build/libs/javafbp-4.1.10-sources.jar.asc
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
-----BEGIN PGP SIGNATURE-----
Version: BCPG v1.64

iQEcBAABCgAGBQJfnZIHAAoJEIoqalWqx6keNAwIAI2LHUc5eByKZAfsdNxMWTIF
BHhAybLOyGETk53ZEEdSW6JxzUvSAHedicM2a9XF1s0uk3ZKXSwMPvHqIXq40Y/Q
Wntyyc3drI8iZ9DsCncUnEXajAG/Kzz2/lfQczaFKPHuwcRZcL3E8Xm3ki4UjhtW
jo7VnYhNVQCEHhG7/kDkTQK1JHfX/G8uZR73CL0Em3OcBTMuRZSQ5eMGPqJhyHVN
hR2BN867Qba3bzZt3CIzCYbcCwEA+UxlcQRBUnHjPLAQJvnlDqt19y6B44swZAXQ
SFbdianZ5GdNdfr8xN6NH+u6XWJQEMJMNFIHhBz/rRzvSoRWoxbi9OAPLiILyYg=
=KSFU
-----END PGP SIGNATURE-----
Binary file added build/libs/javafbp-4.1.10.jar
Binary file not shown.
11 changes: 11 additions & 0 deletions build/libs/javafbp-4.1.10.jar.asc
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
-----BEGIN PGP SIGNATURE-----
Version: BCPG v1.64

iQEcBAABCgAGBQJfnZIHAAoJEIoqalWqx6kedZgH/3YamGeDojxjHyP4VXFQVMK4
7RkmZfx05F/GsaDNZzqL4HB8aNyQg5gWqBtjPIHcUzmrtUcLkLYHuNh1nsKiHag0
FHRSoNxL68OSp720ur4NlDkHZWx6Eqn0+7Z8DPzr+dyzOqNTmXbYySXHbE4/gfUG
/GYzT2/THjTofm9bw+zrIlUCkzdiA3V4ciliULcYqenLeEYMX/rDbxk5+jDHXqUY
GzkPpu+5aDdM4KymWrBfEfNr0eMpPF+go0J1skJ61lTZQHP0t9LtT2wBQE7aQYXd
iLPNS0widXIvaaIi42k+WHuNsglhbJ42C7UFQkGwir2OqAOwTklFjufqiaKcA40=
=+D6a
-----END PGP SIGNATURE-----
Binary file added build/libs/javafbp-4.1.11-javadoc.jar
Binary file not shown.
Binary file added build/libs/javafbp-4.1.11-sources.jar
Binary file not shown.
Binary file added build/libs/javafbp-4.1.11.jar
Binary file not shown.
69 changes: 30 additions & 39 deletions build/publications/mavenJava/module.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@
"component": {
"group": "com.jpaulmorrison",
"module": "javafbp",
"version": "4.1.9",
"version": "4.1.10",
"attributes": {
"org.gradle.status": "release"
}
},
"createdBy": {
"gradle": {
"version": "6.5.1",
"buildId": "el7hc4wyt5gwtm7k7ahmwi3xnq"
"buildId": "ckxwf6i3bjgm3b4w3rb7kd4ufe"
}
},
"variants": [
Expand All @@ -26,13 +26,13 @@
},
"files": [
{
"name": "javafbp-4.1.9.jar",
"url": "javafbp-4.1.9.jar",
"size": 513502,
"sha512": "ebe4584a7aa9caa6db03093aee5c9f7af6169c5466e3c5bd01d998142821b9246ba1c37716d4ca5ba3a45f275452cba6efc148db79c0a53454106be5129921f4",
"sha256": "afd6884bb5115ed155ea6fbf6d708e5ce8cf329d4c82fdb20d7bbfbc8f707af9",
"sha1": "de156c217df7dd287cdf241f5fbfcd93deda1536",
"md5": "68499c77d64565f2bfdaa0ce63099e89"
"name": "javafbp-4.1.10.jar",
"url": "javafbp-4.1.10.jar",
"size": 271180,
"sha512": "15537ce22906ca68570e10b69174d8f1a1e9ef5b303ead8718d3f34330c8974d56288fbf30dd18f789ffb654953f0591f3ad65ed8b15eff928a92aee0829fd8d",
"sha256": "58db6641b46c8f993c4d6d0f175bf438c135ccbc407192f454643bfb72003e09",
"sha1": "cebc5246c210245169db875d001215079986bf50",
"md5": "396ae00d8582f23e45dea91bf9a984ef"
}
]
},
Expand All @@ -45,24 +45,15 @@
"org.gradle.libraryelements": "jar",
"org.gradle.usage": "java-runtime"
},
"dependencies": [
{
"group": "com.google.code.gson",
"module": "gson",
"version": {
"requires": "2.8.6"
}
}
],
"files": [
{
"name": "javafbp-4.1.9.jar",
"url": "javafbp-4.1.9.jar",
"size": 513502,
"sha512": "ebe4584a7aa9caa6db03093aee5c9f7af6169c5466e3c5bd01d998142821b9246ba1c37716d4ca5ba3a45f275452cba6efc148db79c0a53454106be5129921f4",
"sha256": "afd6884bb5115ed155ea6fbf6d708e5ce8cf329d4c82fdb20d7bbfbc8f707af9",
"sha1": "de156c217df7dd287cdf241f5fbfcd93deda1536",
"md5": "68499c77d64565f2bfdaa0ce63099e89"
"name": "javafbp-4.1.10.jar",
"url": "javafbp-4.1.10.jar",
"size": 271180,
"sha512": "15537ce22906ca68570e10b69174d8f1a1e9ef5b303ead8718d3f34330c8974d56288fbf30dd18f789ffb654953f0591f3ad65ed8b15eff928a92aee0829fd8d",
"sha256": "58db6641b46c8f993c4d6d0f175bf438c135ccbc407192f454643bfb72003e09",
"sha1": "cebc5246c210245169db875d001215079986bf50",
"md5": "396ae00d8582f23e45dea91bf9a984ef"
}
]
},
Expand All @@ -76,13 +67,13 @@
},
"files": [
{
"name": "javafbp-4.1.9-sources.jar",
"url": "javafbp-4.1.9-sources.jar",
"size": 258844,
"sha512": "e8af811d74d2c17e5d9b1c3522780c89a5cc5f7debfbd6abbe00bb23f9c19131e6f5c000ba90ada3f9eb8f05de8adc1b5759e19720860e9baaf45638eb139754",
"sha256": "5178bc37aaadb4473139cb0bc14ec8c4e3494ff15b1ea878abd7bef702105730",
"sha1": "e2b65898387179736909f6ca6ee76936e05c3d56",
"md5": "692e90f653c8c46a4856ee298a5a93bc"
"name": "javafbp-4.1.10-sources.jar",
"url": "javafbp-4.1.10-sources.jar",
"size": 257358,
"sha512": "3c41cbcff9f644a9966d8f57250d758f38e4d5a318a48d9238170519979a742745335fc7f077ac2024cb01aa66db0137ee221830f24f965a27104c394d144d83",
"sha256": "2c50f3ea3f26b1213ac58dfabd3ae59181cad705b52e49a9b22086f8632418f0",
"sha1": "e90eda80339b5315f9c2384f58dd2547d0e35749",
"md5": "44ab423c57287f81550dc32bdfa1b420"
}
]
},
Expand All @@ -96,13 +87,13 @@
},
"files": [
{
"name": "javafbp-4.1.9-javadoc.jar",
"url": "javafbp-4.1.9-javadoc.jar",
"size": 688636,
"sha512": "ec64c4add3ab841b5b1a3e8a9874104dbf0a5510f9a25e4bfb75f060091fc6203b3cadb95b39c2471ecee5146f54df109dfee7ecf20f7795edb181439edb3da2",
"sha256": "9e523eddbbe0bb77895489aac5d0c71f09455fa4dfbafb65fd98ec17c9ef42a1",
"sha1": "783cfd23208c6d9eee388bbdce28125a38903529",
"md5": "8760c31a23376aaa3e142b193f62e1f9"
"name": "javafbp-4.1.10-javadoc.jar",
"url": "javafbp-4.1.10-javadoc.jar",
"size": 688802,
"sha512": "0509a7599867aca213d70d091b746843f12e9ebdd5f7b7bfe4db774b9ba953409af41e9f115364a886ca5ac5d0c0cad62b8d56c1b890ec2809b43eea305375bc",
"sha256": "24ac5387722eb5184f9d7f8e89acda954f20f9e7b95e805ec1533a28fa171c74",
"sha1": "d3c3a736198ff9514d278ae3fe41fca95673a852",
"md5": "c697c7653beddb16846e82ec6cf4591f"
}
]
}
Expand Down
14 changes: 7 additions & 7 deletions build/publications/mavenJava/module.json.asc
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
-----BEGIN PGP SIGNATURE-----
Version: BCPG v1.64

iQEcBAABCgAGBQJfmHGfAAoJEIoqalWqx6keILIH/3UcP28l5zZc/IReveCN0xH4
16Ato8F+EvB7ZT6TFoaOhKQ7DgsE3zf3uXsy+LDmRFdqau6vTn4JQQ6TuWYF+sNL
quJ77CXBJPtofc7E4BjL9ZINP+BBCjFMJ2/kP9Ch39D4lYI3qVM7yqXNT/2ne90x
qZduOvkkgmF5jzwnR7enFTOZtJH/MVI43OS2Yh5tNBVM6tMoVR+SEM0roYsZ/XLj
WTtk6vDIBRPgvv66VrWVx1sJFjmduDIb8/AkUQHVHBGXZrt2lzdpdzU86XQTuDRc
//7i7QQ3KXxgt9nEz/qG+hsBHcWb/G1pnUWTvhlxR5g0Q0dZqJJb3rKNlfP9IaQ=
=wltk
iQEcBAABCgAGBQJfnZIHAAoJEIoqalWqx6kePbEIAKGUiQclk3/yqvbr7389sY0p
Cv68QfHKgxQHbxAIpOue6AmArFCT3FLHAE/KWLvm/4yB/INvr+rZewrTaBTdDanJ
M4172m75xZEz2bQKKBS84Z3v/vwxeIaKgtzX2Btw5tXnIgWMcBvPCdaHBIBR7hT7
aZFB23dwbq5GAjvYusUZx8zR2gmYLUJAceduIdTUPTGsesciOuPmJxoS79piu/2J
UzTxgCVxD/O+9cMtZMKLjPtOtAJj61lgOKod9P5fz23X5TQbGWfr0rPhu9YtHKji
CIyM5fhEgqiL4v4A3txkjkogaaCWT8a/mw+gUcSNDmbEiUXPARbipKT7SADGyKs=
=pepC
-----END PGP SIGNATURE-----
10 changes: 1 addition & 9 deletions build/publications/mavenJava/pom-default.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.jpaulmorrison</groupId>
<artifactId>javafbp</artifactId>
<version>4.1.9</version>
<version>4.1.10</version>
<name>JavaFBP</name>
<description>Java implementation of Flow-Based Programming</description>
<url>https://github.com/jpaulm/javafbp</url>
Expand All @@ -31,12 +31,4 @@
<developerConnection>scm:git:ssh:https://github.com/jpaulm.git</developerConnection>
<url>https://github.com/jpaulm.git</url>
</scm>
<dependencies>
<dependency>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
<version>2.8.6</version>
<scope>runtime</scope>
</dependency>
</dependencies>
</project>
14 changes: 7 additions & 7 deletions build/publications/mavenJava/pom-default.xml.asc
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
-----BEGIN PGP SIGNATURE-----
Version: BCPG v1.64

iQEcBAABCgAGBQJfmHGeAAoJEIoqalWqx6keaFcH/083+zFYPr7caJAgTzL/1541
3TsLM/mQsecY5Y8TxzOl3VkK3IaMwa/OOG7WXzkcPjJNkIgN6fUU69W/jWLDKUh9
04HD9jebtG/BU4trhizCeNYyWn8ISe8FKTk3s9JYoSLgl7mqP+SORR2vNpg2Q5lv
3x1yKkyLYN/xG9itzREMw60Ov8VlSpYnbVsfREORxEal/6nSvnAZuArl0IV/bBuv
y5ORfta/Y2mE/hcho9dcnpDFJpEZUAcxPxmyC1Qm5dWtnlvUUQiQfpQVp5/+F25l
xA/fAyOWWdYMZOjMeXuVD/g0Q0CvKKh4P4vfSnRIfEoi/Gk+ORTIenrSOIp6AL8=
=zXY9
iQEcBAABCgAGBQJfnZIHAAoJEIoqalWqx6ke+fQH/2bi9B5+9RHcmDm9SrK4nuBD
/Lkl+wu9JcLjatiiFHBIRW9g5QryLSGAzYgnsWcdqGOamQQIkoNPfj+voiutCoxW
bvTsx7lBEJ52ak6F5wRw8W8w87DpecBQkzlV6D/7dzeOI0pJntQ1c7Mv/AJr1YwF
wZuHoeI+lqjzyDbLdmrDfgchfUqVzfwhHUmPT01os7ajwPz+X3on3JSofN6fyWPG
zxFU1lTGvlFsnUU13yE4OgiwP5P7kP2a+BrOMJNrBwjq7cLtVHq9FWHRdfvxajKM
XBQBdZ4zvzH/Z+vVTXm0lSBeSGz7icPQ88qKVwE7dAw+Xl7ZN1DXvCs0QsAVAcw=
=jlUz
-----END PGP SIGNATURE-----
2 changes: 1 addition & 1 deletion build/scripts/javafbp
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ case "`uname`" in
;;
esac

CLASSPATH=$APP_HOME/lib/javafbp-4.1.9.jar:$APP_HOME/lib/gson-2.8.6.jar
CLASSPATH=$APP_HOME/lib/javafbp-4.1.11.jar


# Determine the Java command to use to start the JVM.
Expand Down
2 changes: 1 addition & 1 deletion build/scripts/javafbp.bat
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ set CMD_LINE_ARGS=%*
:execute
@rem Setup the command line

set CLASSPATH=%APP_HOME%\lib\javafbp-4.1.9.jar;%APP_HOME%\lib\gson-2.8.6.jar
set CLASSPATH=%APP_HOME%\lib\javafbp-4.1.11.jar


@rem Execute javafbp
Expand Down
18 changes: 9 additions & 9 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -14,16 +14,16 @@
</licenses>
<dependencies>
<dependency>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
<version>2.8.6</version>
<scope>compile</scope>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
<version>2.8.6</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
<version>8.0.22</version>
<scope>compile</scope>
</dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
<version>8.0.22</version>
<scope>provided</scope>
</dependency>
</dependencies>
</project>
Loading

0 comments on commit e7fbc32

Please sign in to comment.