Skip to content

Commit 903df2d

Browse files
committed
Upgrades GPLv2 to GPLv3
1 parent a1b3bc0 commit 903df2d

File tree

11 files changed

+676
-322
lines changed

11 files changed

+676
-322
lines changed

LICENSE

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,11 @@ Maven Launch4j Plugin 1.0
22
A plugin for using Launch4j in Maven projects.
33

44
Copyright (c) 2006 Paul Jungwirth
5+
Copyright (c) 2011-2025 Lukasz Lenart
56

67
This program is free software; you can redistribute it and/or modify
78
it under the terms of the GNU General Public License as published by
8-
the Free Software Foundation; either version 2 of the License, or
9+
the Free Software Foundation; either version 3 of the License, or
910
(at your option) any later version.
1011

1112
This program is distributed in the hope that it will be useful,

pom.xml

Lines changed: 27 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,36 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<!-- Maven Launch4j Plugin Copyright (c) 2006 Paul Jungwirth This program
3-
is free software; you can redistribute it and/or modify it under the terms
4-
of the GNU General Public License as published by the Free Software Foundation;
5-
either version 2 of the License, or (at your option) any later version. This
6-
program is distributed in the hope that it will be useful, but WITHOUT ANY
7-
WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
8-
FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
9-
You should have received a copy of the GNU General Public License along with
10-
this program; if not, write to the Free Software Foundation, Inc., 51 Franklin
11-
St, Fifth Floor, Boston, MA 02110-1301 USA -->
12-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
2+
<!--
3+
Maven Launch4j Plugin 1.0
4+
A plugin for using Launch4j in Maven projects.
5+
6+
Copyright (c) 2006 Paul Jungwirth
7+
Copyright (c) 2011-2025 Lukasz Lenart
8+
9+
This program is free software; you can redistribute it and/or modify
10+
it under the terms of the GNU General Public License as published by
11+
the Free Software Foundation; either version 3 of the License, or
12+
(at your option) any later version.
13+
14+
This program is distributed in the hope that it will be useful,
15+
but WITHOUT ANY WARRANTY; without even the implied warranty of
16+
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
17+
GNU General Public License for more details.
18+
19+
You should have received a copy of the GNU General Public License
20+
along with this program; if not, write to the Free Software
21+
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
22+
23+
A complete copy of this license may be found in src/main/legal/LICENSE.txt of the source distribution.
24+
-->
25+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
26+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
1327
<modelVersion>4.0.0</modelVersion>
1428

1529
<parent>
1630
<groupId>org.sonatype.oss</groupId>
1731
<artifactId>oss-parent</artifactId>
1832
<version>9</version>
19-
<relativePath />
33+
<relativePath/>
2034
</parent>
2135

2236
<groupId>com.akathist.maven.plugins.launch4j</groupId>
@@ -211,9 +225,6 @@
211225
<groupId>org.apache.maven.plugins</groupId>
212226
<artifactId>maven-site-plugin</artifactId>
213227
<version>3.21.0</version>
214-
<configuration>
215-
<relativizeDecorationLinks>false</relativizeDecorationLinks>
216-
</configuration>
217228
<dependencies>
218229
<dependency>
219230
<groupId>org.apache.maven.doxia</groupId>
@@ -260,7 +271,7 @@
260271
</goals>
261272
</pluginExecutionFilter>
262273
<action>
263-
<ignore />
274+
<ignore/>
264275
</action>
265276
</pluginExecution>
266277
</pluginExecutions>

src/main/java/com/akathist/maven/plugins/launch4j/ClassPath.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
/*
22
* Maven Launch4j Plugin
33
* Copyright (c) 2006 Paul Jungwirth
4+
* Copyright (c) 2011-2025 Lukasz Lenart
45
*
56
* This program is free software; you can redistribute it and/or modify
67
* it under the terms of the GNU General Public License as published by
7-
* the Free Software Foundation; either version 2 of the License, or
8+
* the Free Software Foundation; either version 3 of the License, or
89
* (at your option) any later version.
910
*
1011
* This program is distributed in the hope that it will be useful,

src/main/java/com/akathist/maven/plugins/launch4j/Jre.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
/*
22
* Maven Launch4j Plugin
33
* Copyright (c) 2006 Paul Jungwirth
4+
* Copyright (c) 2011-2025 Lukasz Lenart
45
*
56
* This program is free software; you can redistribute it and/or modify
67
* it under the terms of the GNU General Public License as published by
7-
* the Free Software Foundation; either version 2 of the License, or
8+
* the Free Software Foundation; either version 3 of the License, or
89
* (at your option) any later version.
910
*
1011
* This program is distributed in the hope that it will be useful,

src/main/java/com/akathist/maven/plugins/launch4j/Launch4jMojo.java

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
/*
22
* Maven Launch4j Plugin
33
* Copyright (c) 2006 Paul Jungwirth
4+
* Copyright (c) 2011-2025 Lukasz Lenart
45
*
56
* This program is free software; you can redistribute it and/or modify
67
* it under the terms of the GNU General Public License as published by
7-
* the Free Software Foundation; either version 2 of the License, or
8+
* the Free Software Foundation; either version 3 of the License, or
89
* (at your option) any later version.
910
*
1011
* This program is distributed in the hope that it will be useful,
@@ -84,7 +85,7 @@ public class Launch4jMojo extends AbstractMojo {
8485

8586
// intentionally non-static non-final so it can be hacked with reflection if someone really needs to
8687
private String DEF_REQADMMAN_FILE = "target/classes/META-INF/manifest-requireAdminRights.xml";
87-
88+
8889
/**
8990
* Maven Session.
9091
*/
@@ -363,7 +364,7 @@ private void doExecute() throws MojoExecutionException {
363364
getLog().debug("Skipping execution of the plugin");
364365
return;
365366
}
366-
367+
367368
processRequireAdminRights();
368369

369370
fillSensibleJreDefaults();
@@ -508,7 +509,7 @@ private void doExecute() throws MojoExecutionException {
508509
}
509510
}
510511
}
511-
512+
512513
private void fillSensibleJreDefaults() throws MojoExecutionException {
513514
if (jre == null) {
514515
jre = new Jre();
@@ -533,7 +534,7 @@ private void processRequireAdminRights() throws MojoExecutionException {
533534
try {
534535
File metaInfDir = new File(basedir, "target/classes/META-INF");
535536
metaInfDir.mkdir();
536-
537+
537538
File manFile = new File(basedir, DEF_REQADMMAN_FILE);
538539
byte[] manBytes = FileUtils.readResourceAsBytes(DEF_REQADMMAN_RES);
539540

@@ -551,7 +552,7 @@ private void processRequireAdminRights() throws MojoExecutionException {
551552
}
552553
}
553554
}
554-
555+
555556
/**
556557
* Prepares a little directory for launch4j to do its thing. Launch4j needs a bunch of object files
557558
* (in the w32api and head directories) and the ld and windres binaries (in the bin directory).
@@ -621,7 +622,7 @@ private File unpackWorkDir(Artifact artifact) throws MojoExecutionException {
621622
}
622623

623624
boolean artifactIsSnapshot = !artifact.getVersion().equals(artifact.getBaseVersion());
624-
625+
625626
getLog().debug("Unpacking " + localArtifact + " into " + localArtifact.getFile());
626627
File platJar = localArtifact.getFile();
627628
File dest = platJar.getParentFile();
@@ -632,7 +633,7 @@ private File unpackWorkDir(Artifact artifact) throws MojoExecutionException {
632633
// If the artifact is a SNAPSHOT, then a.getVersion() will report the long timestamp,
633634
// but getFile() will be 1.1-SNAPSHOT.
634635
// Since getFile() doesn't use the timestamp, all timestamps wind up in the same place.
635-
636+
636637
// WRONG. getFile returns names like
637638
// "lbfork-launch4j-3.53-20240105.004437-1-workdir-win32.jar" as of
638639
// 2024-01-05.
@@ -644,7 +645,7 @@ private File unpackWorkDir(Artifact artifact) throws MojoExecutionException {
644645
getLog().info("Unexpected workdir, correcting from " + oldWorkdirStr + " to " + newWorkdirStr);
645646
workdir = new File(newWorkdirStr);
646647
}
647-
648+
648649
// Therefore we need to expand the jar every time, if the marker file is stale.
649650
if (marker.exists() && marker.lastModified() > platJar.lastModified()) {
650651
// if (marker.exists() && marker.platJar.getName().indexOf("SNAPSHOT") == -1) {

src/main/java/com/akathist/maven/plugins/launch4j/MavenLog.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
/*
22
* Maven Launch4j Plugin
33
* Copyright (c) 2006 Paul Jungwirth
4+
* Copyright (c) 2011-2025 Lukasz Lenart
45
*
56
* This program is free software; you can redistribute it and/or modify
67
* it under the terms of the GNU General Public License as published by
7-
* the Free Software Foundation; either version 2 of the License, or
8+
* the Free Software Foundation; either version 3 of the License, or
89
* (at your option) any later version.
910
*
1011
* This program is distributed in the hope that it will be useful,

src/main/java/com/akathist/maven/plugins/launch4j/Messages.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
/*
22
* Maven Launch4j Plugin
33
* Copyright (c) 2006 Paul Jungwirth
4+
* Copyright (c) 2011-2025 Lukasz Lenart
45
*
56
* This program is free software; you can redistribute it and/or modify
67
* it under the terms of the GNU General Public License as published by
7-
* the Free Software Foundation; either version 2 of the License, or
8+
* the Free Software Foundation; either version 3 of the License, or
89
* (at your option) any later version.
910
*
1011
* This program is distributed in the hope that it will be useful,

src/main/java/com/akathist/maven/plugins/launch4j/SingleInstance.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
/*
22
* Maven Launch4j Plugin
33
* Copyright (c) 2006 Paul Jungwirth
4+
* Copyright (c) 2011-2025 Lukasz Lenart
45
*
56
* This program is free software; you can redistribute it and/or modify
67
* it under the terms of the GNU General Public License as published by
7-
* the Free Software Foundation; either version 2 of the License, or
8+
* the Free Software Foundation; either version 3 of the License, or
89
* (at your option) any later version.
910
*
1011
* This program is distributed in the hope that it will be useful,

src/main/java/com/akathist/maven/plugins/launch4j/Splash.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
/*
22
* Maven Launch4j Plugin
33
* Copyright (c) 2006 Paul Jungwirth
4+
* Copyright (c) 2011-2025 Lukasz Lenart
45
*
56
* This program is free software; you can redistribute it and/or modify
67
* it under the terms of the GNU General Public License as published by
7-
* the Free Software Foundation; either version 2 of the License, or
8+
* the Free Software Foundation; either version 3 of the License, or
89
* (at your option) any later version.
910
*
1011
* This program is distributed in the hope that it will be useful,

src/main/java/com/akathist/maven/plugins/launch4j/VersionInfo.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
/*
22
* Maven Launch4j Plugin
33
* Copyright (c) 2006 Paul Jungwirth
4+
* Copyright (c) 2011-2025 Lukasz Lenart
45
*
56
* This program is free software; you can redistribute it and/or modify
67
* it under the terms of the GNU General Public License as published by
7-
* the Free Software Foundation; either version 2 of the License, or
8+
* the Free Software Foundation; either version 3 of the License, or
89
* (at your option) any later version.
910
*
1011
* This program is distributed in the hope that it will be useful,

0 commit comments

Comments
 (0)