Skip to content

Commit 40e3ade

Browse files
committed
Fixed Issue Sergix#20
View changelog entry Sergix#72 for details.
1 parent 6687cf7 commit 40e3ade

15 files changed

+46
-15
lines changed

build.bat

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
@echo off
22
cls
33

4-
mvn clean package -DgroupId=org.apache.commons -DartifactId=commons-lang3
4+
rd /S /Q target
5+
6+
mvn clean package

changelog.txt

+14
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,17 @@
1+
(#72)[9/8/2017-12:47 0.4.0 Sergix]
2+
Fixed Issue #20.
3+
- Maven was not loading the dependencies into the output JAR.
4+
- Added the maven-assembly-plugin to the POM.
5+
Slight modifications to the batch build and run scripts.
6+
The Maven package process now builds two JAR's: one w/o dependencies and one with.
7+
- If you perform the "run" batch script right after a build, it will rename the files to their respective names.
8+
- Packaged JAR, no dependencies (before name change w/ "run"): jterm-0.5.0.jar
9+
- Packaged JAR, with dependencies (before name change w/ "run"): jterm-0.5.0-jar-with-dependencies.jar
10+
- Packaged JAR, no dependencies (after name change w/ "run"): jterm-0.5.0-no-deps.jar
11+
- Packaged JAR, with dependencies (after name change w/ "run"): jterm-v0.5.0.jar
12+
Closed Issue #20.
13+
Pushed updates to Git.
14+
115
(#71)[9/7/2017-21:52 0.4.0 Sergix]
216
Deleted the Dir and readfile branches.
317
Updated some stuff in the Slack group! :D

lib/commons-lang3-3.6.jar

-483 KB
Binary file not shown.

pom.xml

+19-12
Original file line numberDiff line numberDiff line change
@@ -28,17 +28,24 @@
2828
</configuration>
2929
</plugin>
3030
<plugin>
31-
<artifactId>org.apache.commons.lang3</artifactId>
32-
<configuration>
33-
<archive>
34-
<manifest>
35-
<addClasspath>true</addClasspath>
36-
<classpathLayoutType>custom</classpathLayoutType>
37-
<customClasspathLayout>WEB-INF/lib/commons-lang3-3.6.jar</customClasspathLayout>
38-
</manifest>
39-
</archive>
40-
</configuration>
31+
<groupId>org.apache.maven.plugins</groupId>
32+
<artifactId>maven-assembly-plugin</artifactId>
33+
<executions>
34+
<execution>
35+
<id>create-my-bundle</id>
36+
<phase>package</phase>
37+
<goals>
38+
<goal>single</goal>
39+
</goals>
40+
<configuration>
41+
<descriptorRefs>
42+
<descriptorRef>jar-with-dependencies</descriptorRef>
43+
</descriptorRefs>
44+
</configuration>
45+
</execution>
46+
</executions>
4147
</plugin>
48+
4249
</plugins>
4350
</build>
4451

@@ -50,8 +57,8 @@
5057
<scope>test</scope>
5158
</dependency>
5259
<dependency>
53-
<groupId>org.apache.commons</groupId>
54-
<artifactId>commons-lang3</artifactId>
60+
<groupId>com.apache.commons</groupId>
61+
<artifactId>lang3</artifactId>
5562
<version>3.6</version>
5663
</dependency>
5764
</dependencies>

run.bat

+8-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
11
@echo off
22

3-
java -cp target/jterm-0.5.0.jar main.java.jterm.JTerm
3+
cd target
4+
if EXIST "jterm-0.5.0-jar-with-dependencies.jar" (
5+
ren jterm-0.5.0.jar jterm-0.5.0-no-deps.jar
6+
ren jterm-0.5.0-jar-with-dependencies.jar jterm-v0.5.0.jar
7+
)
8+
cd ..
9+
10+
java -cp target/jterm-v0.5.0.jar main.java.jterm.JTerm

src/main/java/jterm/Files.java

+2
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@
2323
import java.io.IOException;
2424
import java.util.ArrayList;
2525

26+
import main.java.jterm.JTerm;
27+
2628
public class Files
2729
{
2830

src/main/java/jterm/JTerm.java

-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
import java.io.*;
2222
import java.util.ArrayList;
2323
import java.util.Hashtable;
24-
2524
public class JTerm
2625
{
2726

-29 Bytes
Binary file not shown.
-172 Bytes
Binary file not shown.
-95 Bytes
Binary file not shown.
127 Bytes
Binary file not shown.
-124 Bytes
Binary file not shown.
127 Bytes
Binary file not shown.
-50 Bytes
Binary file not shown.
-125 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)