Commit 998d69f3 authored by Brian Long's avatar Brian Long
Browse files

Merge branch 'develop' into stable

parents a358be79 3625e67c

fluent-regex.txt

0 → 100644
+4 −0
Original line number Diff line number Diff line 
Regex:

public void set([^\{]+)\{(\W*)this\.([^;]+);(\W*)}

Replace:

public void set$1\{$2this\.$3;$4}\n\n\tpublic HistoricTaskQueryRepresentation with$1\{$2this\.$3;$2return this;$4}
 
 No newline at end of file

pom.xml

+4 −3
Original line number Diff line number Diff line
@@ -42,8 +42,9 @@ 
		<maven.compiler.target>8</maven.compiler.target>

		<maven.compiler.debuglevel>lines,vars,source</maven.compiler.debuglevel>

		

		<jersey.version>2.35</jersey.version>

		<cxf.version>3.4.7</cxf.version>

		<jersey.version>2.39.1</jersey.version>

		<cxf.version>3.5.6</cxf.version>

		<jackson.version>2.15.1</jackson.version>

	</properties>



	<dependencies>
@@ -55,7 +56,7 @@ 
		<dependency>

			<groupId>com.fasterxml.jackson.module</groupId>

			<artifactId>jackson-module-jaxb-annotations</artifactId>

			<version>2.12.2</version>

			<version>${jackson.version}</version>

		</dependency>

		<dependency>

			<groupId>org.apache.cxf</groupId>