Skip to content

Commit 18e7bc3

Browse files
authored
Merge pull request #3 from Inform-Software/feature/minor-cleanups
Minor cleanups
2 parents 0e12584 + 40ff6c2 commit 18e7bc3

23 files changed

Lines changed: 66 additions & 507 deletions

.classpath

Lines changed: 0 additions & 27 deletions
This file was deleted.

.gitignore

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,9 @@
77
/junit-reports
88
/TEMP-INF
99
/target/
10-
/settings.xml
10+
/settings.xml
11+
12+
# Eclispe
13+
/.classpath
14+
/.project
15+
/.settings/

.project

Lines changed: 0 additions & 23 deletions
This file was deleted.

.settings/org.eclipse.core.resources.prefs

Lines changed: 0 additions & 4 deletions
This file was deleted.

.settings/org.eclipse.jdt.core.prefs

Lines changed: 0 additions & 6 deletions
This file was deleted.

.settings/org.eclipse.m2e.core.prefs

Lines changed: 0 additions & 4 deletions
This file was deleted.

NOTICE

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,10 @@ Apache License, Version 2.0. The following files have been modified:
4444
Changes: Removing Bouncy Castle classes and linking to the JAR instead.
4545

4646

47-
File: src/main/java/org/apache/commons/ssl/TrustMaterial.java
47+
File: src/main/java/org/apache/commons/ssl/*
4848

49-
Changes: Replacing direct printStackTrace calls with Logger calls.
49+
Changes: Replacing direct printStackTrace calls with Logger calls, remove
50+
logging "abstraction".
5051

5152

5253
Files: src/main/java/org/apache/commons/ssl/org/bouncycastle/*
@@ -62,7 +63,6 @@ under the terms of the Apache License, Version 2.0.
6263

6364
Apache Commons HttpClient 3.0.1
6465
Apache Commons Logging 1.2
65-
Apache Log4j 1.2.16
6666
Byte Buddy 1.8.8
6767
Objenesis 2.5.1
6868

lib/log4j-1.2.17.jar

-478 KB
Binary file not shown.

pom.xml

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -152,11 +152,6 @@
152152
<artifactId>commons-logging</artifactId>
153153
<version>1.2</version>
154154
</additionalDependency>
155-
<additionalDependency>
156-
<groupId>log4j</groupId>
157-
<artifactId>log4j</artifactId>
158-
<version>1.2.17</version>
159-
</additionalDependency>
160155
</additionalDependencies>
161156
</configuration>
162157
<executions>
@@ -250,11 +245,6 @@
250245
<artifactId>commons-logging</artifactId>
251246
<version>1.2</version>
252247
</dependency>
253-
<dependency>
254-
<groupId>log4j</groupId>
255-
<artifactId>log4j</artifactId>
256-
<version>1.2.17</version>
257-
</dependency>
258248
<dependency>
259249
<groupId>net.bytebuddy</groupId>
260250
<artifactId>byte-buddy</artifactId>

samples/pbe/java/blowfish-ofb.raw

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1 @@
1-
Salted__���
2-
郖0`�񗔃�]��
1+
Salted__,�;<���TS�\Cj�� w&

0 commit comments

Comments
 (0)