Skip to content

Commit 0588790

Browse files
cmaglieFederico Fissore
cmaglie
authored and
Federico Fissore
committed
Added JARs Bouncy Castle, Jackson, Common-compress
1 parent 48ad7ed commit 0588790

21 files changed

+51
-15
lines changed

Diff for: ‎.classpath

+8-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<classpathentry kind="lib" path="app/test-lib/junit-4.11.jar"/>
1111
<classpathentry kind="lib" path="app/test-lib/fest-assert-1.2.jar"/>
1212
<classpathentry kind="lib" path="app/test-lib/fest-reflect-1.2.jar"/>
13-
<classpathentry kind="lib" path="app/test-lib/fest-swing-1.2.jar" sourcepath="/home/megabug/git/fest-swing-1.2-sources.jar"/>
13+
<classpathentry kind="lib" path="app/test-lib/fest-swing-1.2.jar"/>
1414
<classpathentry kind="lib" path="app/test-lib/fest-util-1.1.2.jar"/>
1515
<classpathentry kind="lib" path="app/test-lib/jcip-annotations-1.0.jar"/>
1616
<classpathentry kind="lib" path="app/lib/commons-codec-1.7.jar"/>
@@ -20,6 +20,13 @@
2020
<classpathentry kind="lib" path="app/lib/jmdns-3.4.1.jar"/>
2121
<classpathentry kind="lib" path="app/lib/jsch-0.1.50.jar"/>
2222
<classpathentry kind="lib" path="app/lib/jssc-2.8.0.jar"/>
23+
<classpathentry kind="lib" path="app/lib/bcpg-jdk15on-149.jar"/>
24+
<classpathentry kind="lib" path="app/lib/bcprov-jdk15on-149.jar"/>
25+
<classpathentry kind="lib" path="app/lib/jackson-core-2.2.3.jar"/>
26+
<classpathentry kind="lib" path="app/lib/jackson-databind-2.2.3.jar"/>
27+
<classpathentry kind="lib" path="app/lib/jackson-module-mrbean-2.2.3.jar"/>
28+
<classpathentry kind="lib" path="app/lib/jackson-annotations-2.2.3.jar"/>
29+
<classpathentry kind="lib" path="app/lib/commons-compress-1.8.jar"/>
2330
<classpathentry combineaccessrules="false" kind="src" path="/arduino-core"/>
2431
<classpathentry kind="output" path="app/bin"/>
2532
</classpath>

Diff for: ‎app/.classpath

+7
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,17 @@
77
<classpathentry kind="lib" path="lib/jna.jar"/>
88
<classpathentry kind="lib" path="lib/ecj.jar"/>
99
<classpathentry kind="lib" path="lib/apple.jar"/>
10+
<classpathentry kind="lib" path="lib/bcpg-jdk15on-149.jar"/>
11+
<classpathentry kind="lib" path="lib/bcprov-jdk15on-149.jar"/>
1012
<classpathentry kind="lib" path="lib/commons-codec-1.7.jar"/>
13+
<classpathentry kind="lib" path="lib/commons-compress-1.8.jar"/>
1114
<classpathentry kind="lib" path="lib/commons-exec-1.1.jar"/>
1215
<classpathentry kind="lib" path="lib/commons-httpclient-3.1.jar"/>
1316
<classpathentry kind="lib" path="lib/commons-logging-1.0.4.jar"/>
17+
<classpathentry kind="lib" path="lib/jackson-annotations-2.2.3.jar"/>
18+
<classpathentry kind="lib" path="lib/jackson-core-2.2.3.jar"/>
19+
<classpathentry kind="lib" path="lib/jackson-databind-2.2.3.jar"/>
20+
<classpathentry kind="lib" path="lib/jackson-module-mrbean-2.2.3.jar"/>
1421
<classpathentry kind="lib" path="lib/jmdns-3.4.1.jar"/>
1522
<classpathentry kind="lib" path="lib/jsch-0.1.50.jar"/>
1623
<classpathentry kind="lib" path="lib/jssc-2.8.0.jar"/>

Diff for: ‎app/lib/bcpg-jdk15on-149.jar

243 KB
Binary file not shown.

Diff for: ‎app/lib/bcprov-jdk15on-149.jar

2.36 MB
Binary file not shown.

Diff for: ‎app/lib/commons-compress-1.8.jar

356 KB
Binary file not shown.

Diff for: ‎app/lib/jackson-annotations-2.2.3.jar

32.7 KB
Binary file not shown.

Diff for: ‎app/lib/jackson-core-2.2.3.jar

188 KB
Binary file not shown.

Diff for: ‎app/lib/jackson-databind-2.2.3.jar

846 KB
Binary file not shown.

Diff for: ‎app/lib/jackson-module-mrbean-2.2.3.jar

67.3 KB
Binary file not shown.

Diff for: ‎arduino-core/.classpath

+10
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,15 @@
99
<classpathentry kind="lib" path="lib/jssc-2.8.0.jar"/>
1010
<classpathentry kind="lib" path="lib/jsch-0.1.50.jar"/>
1111
<classpathentry kind="lib" path="lib/commons-exec-1.1.jar"/>
12+
<classpathentry kind="lib" path="../app/lib/commons-codec-1.7.jar"/>
13+
<classpathentry kind="lib" path="../app/lib/commons-compress-1.8.jar"/>
14+
<classpathentry kind="lib" path="../app/lib/commons-exec-1.1.jar"/>
15+
<classpathentry kind="lib" path="../app/lib/commons-httpclient-3.1.jar"/>
16+
<classpathentry kind="lib" path="../app/lib/jackson-annotations-2.2.3.jar"/>
17+
<classpathentry kind="lib" path="../app/lib/jackson-core-2.2.3.jar"/>
18+
<classpathentry kind="lib" path="../app/lib/jackson-databind-2.2.3.jar"/>
19+
<classpathentry kind="lib" path="../app/lib/jackson-module-mrbean-2.2.3.jar"/>
20+
<classpathentry kind="lib" path="../app/lib/bcpg-jdk15on-149.jar"/>
21+
<classpathentry kind="lib" path="../app/lib/bcprov-jdk15on-149.jar"/>
1222
<classpathentry kind="output" path="bin"/>
1323
</classpath>

Diff for: ‎arduino-core/lib/bcpg-jdk15on-149.jar

243 KB
Binary file not shown.

Diff for: ‎arduino-core/lib/bcprov-jdk15on-149.jar

2.36 MB
Binary file not shown.

Diff for: ‎arduino-core/lib/commons-compress-1.8.jar

356 KB
Binary file not shown.

Diff for: ‎arduino-core/lib/jackson-annotations-2.2.3.jar

32.7 KB
Binary file not shown.

Diff for: ‎arduino-core/lib/jackson-core-2.2.3.jar

188 KB
Binary file not shown.

Diff for: ‎arduino-core/lib/jackson-databind-2.2.3.jar

846 KB
Binary file not shown.

Diff for: ‎arduino-core/lib/jackson-module-mrbean-2.2.3.jar

67.3 KB
Binary file not shown.

Diff for: ‎build/build.xml

+1-11
Original file line numberDiff line numberDiff line change
@@ -50,17 +50,7 @@
5050
<fileset dir=".." id="runtime.jars">
5151
<include name="arduino-core/arduino-core.jar" />
5252
<include name="app/pde.jar" />
53-
<include name="app/lib/commons-codec-1.7.jar" />
54-
<include name="app/lib/commons-exec-1.1.jar" />
55-
<include name="app/lib/commons-httpclient-3.1.jar" />
56-
<include name="app/lib/commons-logging-1.0.4.jar" />
57-
<include name="app/lib/ecj.jar" />
58-
<include name="app/lib/jmdns-3.4.1.jar" />
59-
<include name="app/lib/jna.jar" />
60-
<include name="app/lib/jsch-0.1.50.jar" />
61-
<include name="app/lib/jssc-2.8.0.jar" />
62-
<include name="app/lib/ant.jar" />
63-
<include name="app/lib/ant-launcher.jar" />
53+
<include name="app/lib/*.jar" />
6454
</fileset>
6555

6656
<target name="build" description="Build Arduino.">

Diff for: ‎build/macosx/template.app/Contents/Info.plist

+1-1
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@
9797
<!-- In 0149, removed /System/Library/Java from the CLASSPATH because
9898
it can cause problems if users have installed weird files there.
9999
http://dev.processing.org/bugs/show_bug.cgi?id=1045 -->
100-
<string>$JAVAROOT/pde.jar:$JAVAROOT/arduino-core.jar:$JAVAROOT/antlr.jar:$JAVAROOT/apple.jar:$JAVAROOT/ecj.jar:$JAVAROOT/registry.jar:$JAVAROOT/quaqua.jar:$JAVAROOT/jssc-2.8.0.jar:$JAVAROOT/commons-codec-1.7.jar:$JAVAROOT/commons-exec-1.1.jar:$JAVAROOT/commons-httpclient-3.1.jar:$JAVAROOT/commons-logging-1.0.4.jar:$JAVAROOT/jmdns-3.4.1.jar:$JAVAROOT/jsch-0.1.50.jar:$JAVAROOT/jna.jar</string>
100+
<string>$JAVAROOT/pde.jar:$JAVAROOT/arduino-core.jar:$JAVAROOT/antlr.jar:$JAVAROOT/apple.jar:$JAVAROOT/bcpg-jdk15on-149.jar:$JAVAROOT/bcprov-jdk15on-149.jar:$JAVAROOT/commons-codec-1.7.jar:$JAVAROOT/commons-compress-1.8.jar:$JAVAROOT/commons-exec-1.1.jar:$JAVAROOT/quaqua.jar:$JAVAROOT/commons-httpclient-3.1.jar:$JAVAROOT/commons-logging-1.0.4.jar:$JAVAROOT/ecj.jar:$JAVAROOT/registry.jar:$JAVAROOT/jackson-annotations-2.2.3.jar:$JAVAROOT/jackson-core-2.2.3.jar:$JAVAROOT/jackson-databind-2.2.3.jar:$JAVAROOT/jackson-module-mrbean-2.2.3.jar:$JAVAROOT/jmdns-3.4.1.jar:$JAVAROOT/jna.jar:$JAVAROOT/jsch-0.1.50.jar:$JAVAROOT/jssc-2.8.0.jar</string>
101101

102102
<key>JVMArchs</key>
103103
<array>

Diff for: ‎build/windows/launcher/config.xml

+12-1
Original file line numberDiff line numberDiff line change
@@ -15,17 +15,28 @@
1515
<icon>application.ico</icon>
1616
<classPath>
1717
<mainClass>processing.app.Base</mainClass>
18+
<cp>lib/antlr.jar</cp>
19+
<cp>lib/apple.jar</cp>
1820
<cp>lib/arduino-core.jar</cp>
19-
<cp>lib/pde.jar</cp>
21+
<cp>lib/bcpg-jdk15on-149.jar</cp>
22+
<cp>lib/bcprov-jdk15on-149.jar</cp>
2023
<cp>lib/commons-codec-1.7.jar</cp>
24+
<cp>lib/commons-compress-1.8.jar</cp>
2125
<cp>lib/commons-exec-1.1.jar</cp>
2226
<cp>lib/commons-httpclient-3.1.jar</cp>
27+
<cp>lib/commons-lang3-3.3.2.jar</cp>
2328
<cp>lib/commons-logging-1.0.4.jar</cp>
2429
<cp>lib/ecj.jar</cp>
30+
<cp>lib/guava-18.0.jar</cp>
31+
<cp>lib/jackson-annotations-2.2.3.jar</cp>
32+
<cp>lib/jackson-core-2.2.3.jar</cp>
33+
<cp>lib/jackson-databind-2.2.3.jar</cp>
34+
<cp>lib/jackson-module-mrbean-2.2.3.jar</cp>
2535
<cp>lib/jmdns-3.4.1.jar</cp>
2636
<cp>lib/jna.jar</cp>
2737
<cp>lib/jsch-0.1.50.jar</cp>
2838
<cp>lib/jssc-2.8.0.jar</cp>
39+
<cp>lib/pde.jar</cp>
2940
</classPath>
3041
<jre>
3142
<path>java</path>

Diff for: ‎build/windows/launcher/config_debug.xml

+12-1
Original file line numberDiff line numberDiff line change
@@ -15,17 +15,28 @@
1515
<icon>application.ico</icon>
1616
<classPath>
1717
<mainClass>processing.app.Base</mainClass>
18+
<cp>lib/antlr.jar</cp>
19+
<cp>lib/apple.jar</cp>
1820
<cp>lib/arduino-core.jar</cp>
19-
<cp>lib/pde.jar</cp>
21+
<cp>lib/bcpg-jdk15on-149.jar</cp>
22+
<cp>lib/bcprov-jdk15on-149.jar</cp>
2023
<cp>lib/commons-codec-1.7.jar</cp>
24+
<cp>lib/commons-compress-1.8.jar</cp>
2125
<cp>lib/commons-exec-1.1.jar</cp>
2226
<cp>lib/commons-httpclient-3.1.jar</cp>
27+
<cp>lib/commons-lang3-3.3.2.jar</cp>
2328
<cp>lib/commons-logging-1.0.4.jar</cp>
2429
<cp>lib/ecj.jar</cp>
30+
<cp>lib/guava-18.0.jar</cp>
31+
<cp>lib/jackson-annotations-2.2.3.jar</cp>
32+
<cp>lib/jackson-core-2.2.3.jar</cp>
33+
<cp>lib/jackson-databind-2.2.3.jar</cp>
34+
<cp>lib/jackson-module-mrbean-2.2.3.jar</cp>
2535
<cp>lib/jmdns-3.4.1.jar</cp>
2636
<cp>lib/jna.jar</cp>
2737
<cp>lib/jsch-0.1.50.jar</cp>
2838
<cp>lib/jssc-2.8.0.jar</cp>
39+
<cp>lib/pde.jar</cp>
2940
</classPath>
3041
<jre>
3142
<path>java</path>

0 commit comments

Comments
 (0)