diff --git a/diylc/diylc-core/pom.xml b/diylc/diylc-core/pom.xml index 2ee50f0d..67ac6d75 100644 --- a/diylc/diylc-core/pom.xml +++ b/diylc/diylc-core/pom.xml @@ -75,16 +75,22 @@ org.diylc.local app-framework 1.0 + system + ${project.basedir}/../lib/app-framework.jar org.diylc.local gerber-writer-api-1.0.0 1.0 + system + ${project.basedir}/../lib/gerber-writer-api-1.0.0.jar org.diylc.local java-http-proxy 1.0 + system + ${project.basedir}/../lib/java-http-proxy.jar diff --git a/diylc/diylc-library/lib/app-framework.jar b/diylc/diylc-library/lib/app-framework.jar deleted file mode 100644 index 683a864c..00000000 Binary files a/diylc/diylc-library/lib/app-framework.jar and /dev/null differ diff --git a/diylc/diylc-library/lib/gerber-writer-api-1.0.0.jar b/diylc/diylc-library/lib/gerber-writer-api-1.0.0.jar deleted file mode 100644 index 09c27e27..00000000 Binary files a/diylc/diylc-library/lib/gerber-writer-api-1.0.0.jar and /dev/null differ diff --git a/diylc/diylc-library/pom.xml b/diylc/diylc-library/pom.xml index b39a53fa..cfc64273 100644 --- a/diylc/diylc-library/pom.xml +++ b/diylc/diylc-library/pom.xml @@ -51,7 +51,7 @@ org.apache.poi poi - 3.5-FINAL + 5.4.0 junit @@ -64,21 +64,29 @@ org.diylc.local app-framework 1.0 + system + ${project.basedir}/../lib/app-framework.jar org.diylc.local gerber-writer-api-1.0.0 1.0 + system + ${project.basedir}/../lib/gerber-writer-api-1.0.0.jar org.diylc.local jep-2.4.1 1.0 + system + ${project.basedir}/../lib/jep-2.4.1.jar org.diylc.local svgSalamander-1.1.2.4 1.0 + system + ${project.basedir}/../lib/svgSalamander-1.1.2.4.jar diff --git a/diylc/diylc-swing/lib/app-framework.jar b/diylc/diylc-swing/lib/app-framework.jar deleted file mode 100644 index 683a864c..00000000 Binary files a/diylc/diylc-swing/lib/app-framework.jar and /dev/null differ diff --git a/diylc/diylc-swing/lib/gerber-writer-api-1.0.0.jar b/diylc/diylc-swing/lib/gerber-writer-api-1.0.0.jar deleted file mode 100644 index 09c27e27..00000000 Binary files a/diylc/diylc-swing/lib/gerber-writer-api-1.0.0.jar and /dev/null differ diff --git a/diylc/diylc-swing/lib/java-http-proxy.jar b/diylc/diylc-swing/lib/java-http-proxy.jar deleted file mode 100644 index 9295029e..00000000 Binary files a/diylc/diylc-swing/lib/java-http-proxy.jar and /dev/null differ diff --git a/diylc/diylc-swing/lib/jep-2.4.1.jar b/diylc/diylc-swing/lib/jep-2.4.1.jar deleted file mode 100644 index 0aea3e52..00000000 Binary files a/diylc/diylc-swing/lib/jep-2.4.1.jar and /dev/null differ diff --git a/diylc/diylc-swing/lib/svgSalamander-1.1.2.4.jar b/diylc/diylc-swing/lib/svgSalamander-1.1.2.4.jar deleted file mode 100644 index e825b66b..00000000 Binary files a/diylc/diylc-swing/lib/svgSalamander-1.1.2.4.jar and /dev/null differ diff --git a/diylc/diylc-swing/lib/swing-framework.jar b/diylc/diylc-swing/lib/swing-framework.jar deleted file mode 100644 index 680dc754..00000000 Binary files a/diylc/diylc-swing/lib/swing-framework.jar and /dev/null differ diff --git a/diylc/diylc-swing/pom.xml b/diylc/diylc-swing/pom.xml index 72fcff35..6ae106e5 100644 --- a/diylc/diylc-swing/pom.xml +++ b/diylc/diylc-swing/pom.xml @@ -65,7 +65,7 @@ org.apache.poi poi - 3.5-FINAL + 5.4.0 com.google.guava @@ -118,31 +118,43 @@ org.diylc.local app-framework 1.0 + system + ${project.basedir}/../lib/app-framework.jar org.diylc.local gerber-writer-api-1.0.0 1.0 + system + ${project.basedir}/../lib/gerber-writer-api-1.0.0.jar org.diylc.local java-http-proxy 1.0 + system + ${project.basedir}/../lib/java-http-proxy.jar org.diylc.local jep-2.4.1 1.0 + system + ${project.basedir}/../lib/jep-2.4.1.jar org.diylc.local svgSalamander-1.1.2.4 1.0 + system + ${project.basedir}/../lib/svgSalamander-1.1.2.4.jar org.diylc.local swing-framework 1.0 + system + ${project.basedir}/../lib/swing-framework.jar diff --git a/diylc/diylc-core/lib/app-framework.jar b/diylc/lib/app-framework.jar similarity index 100% rename from diylc/diylc-core/lib/app-framework.jar rename to diylc/lib/app-framework.jar diff --git a/diylc/diylc-core/lib/gerber-writer-api-1.0.0.jar b/diylc/lib/gerber-writer-api-1.0.0.jar similarity index 100% rename from diylc/diylc-core/lib/gerber-writer-api-1.0.0.jar rename to diylc/lib/gerber-writer-api-1.0.0.jar diff --git a/diylc/diylc-swing/lib/jar-loader.jar b/diylc/lib/jar-loader.jar similarity index 100% rename from diylc/diylc-swing/lib/jar-loader.jar rename to diylc/lib/jar-loader.jar diff --git a/diylc/diylc-core/lib/java-http-proxy.jar b/diylc/lib/java-http-proxy.jar similarity index 100% rename from diylc/diylc-core/lib/java-http-proxy.jar rename to diylc/lib/java-http-proxy.jar diff --git a/diylc/diylc-library/lib/jep-2.4.1.jar b/diylc/lib/jep-2.4.1.jar similarity index 100% rename from diylc/diylc-library/lib/jep-2.4.1.jar rename to diylc/lib/jep-2.4.1.jar diff --git a/diylc/diylc-library/lib/svgSalamander-1.1.2.4.jar b/diylc/lib/svgSalamander-1.1.2.4.jar similarity index 100% rename from diylc/diylc-library/lib/svgSalamander-1.1.2.4.jar rename to diylc/lib/svgSalamander-1.1.2.4.jar diff --git a/diylc/lib/swing-framework.jar b/diylc/lib/swing-framework.jar new file mode 100644 index 00000000..a2c687fa Binary files /dev/null and b/diylc/lib/swing-framework.jar differ