onedev/maven-plugin

Make changes to work with JSW 3.5.41
Robin Shen committed 4 years ago

dfd84482

1 parent bc8f4413
Release

Total 2 files Show one by one

■ ■ ■ ■ ■ ■

pom.xml

		skipped 7 lines
8	8		</parent>
9	9		<artifactId>plugin-maven</artifactId>
10	10		<packaging>maven-plugin</packaging>
11		-	<version>2.0.1</version>
	11	+	<version>2.0.2</version>
12	12		<build>
13	13		<finalName>${project.groupId}.${project.artifactId}-${project.version}</finalName>
14	14		<pluginManagement>
		skipped 109 lines

■ ■ ■ ■ ■ ■

src/main/java/io/onedev/plugin/maven/PackageArtifactsMojo.java

		skipped 77 lines
78	78		copy.setFile(new File(project.getBasedir(), "jsw/AppCommand.bat.in"));
79	79		FilterSet filterSet = copy.createFilterSet();
80	80		filterSet.addFilter("set_fixed_command", "set _FIXED_COMMAND=console");
	81	+	filterSet.addFilter("set_pass_through", "set _PASS_THROUGH=true");
81	82		String propsAndParams = String.format("wrapper.logfile.loglevel=NONE wrapper.console.title=\"OneDev %s\" wrapper.pidfile=onedev_%s.pid wrapper.name=onedev_%s wrapper.displayname=\"OneDev %s\" wrapper.description=\"OneDev %s\" -- %s",
82	83		commandDisplayName, commandName, commandName, commandDisplayName, commandDisplayName, commandName);
83	84		filterSet.addFilter("properties_and_parameters", propsAndParams);
		skipped 13 lines
97	98		filterSet.addFilter("set_fixed_command", "FIXED_COMMAND=console");
98	99		filterSet.addFilter("set_pass_through", "PASS_THROUGH=true");
99	100
100		-	String propsAndParams = String.format("wrapper.logfile.loglevel=NONE wrapper.console.title='OneDev %s' wrapper.name=onedev_%s wrapper.displayname='OneDev %s' wrapper.description='OneDev %s' -- %s",
101		-	commandDisplayName, commandName, commandDisplayName, commandDisplayName, commandName);
	101	+	String propsAndParams = String.format("wrapper.logfile.loglevel=NONE wrapper.console.title='OneDev %s' wrapper.description='OneDev %s' -- %s",
	102	+	commandDisplayName, commandName, commandName);
102	103		filterSet.addFilter("properties_and_parameters", propsAndParams);
103	104		copy.execute();
104	105		}
		skipped 78 lines
183	184		copy.setFile(new File(jswDir, "AppCommand.bat.in"));
184	185		FilterSet filterSet = copy.createFilterSet();
185	186		filterSet.addFilter("set_fixed_command", "");
	187	+	filterSet.addFilter("set_pass_through", "");
186	188		filterSet.addFilter("properties_and_parameters", "wrapper.pidfile=../status/onedev.pid");
187	189		copy.execute();
188	190
		skipped 112 lines

Make changes to work with JSW 3.5.41