Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[AF-1555]: Upgrade to Wildfly14 #483

Merged
merged 1 commit into from
Nov 2, 2018
Merged

[AF-1555]: Upgrade to Wildfly14 #483

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
12 changes: 10 additions & 2 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,9 +85,9 @@
<version.org.picketlink>2.6.0.Final</version.org.picketlink>
<version.org.wildfly.security>1.1.3.Final</version.org.wildfly.security>
<!-- WildFly version used together with the GWT's Super Dev Mode -->
<version.org.wildfly.gwt.sdm>11.0.0.Final</version.org.wildfly.gwt.sdm>
<version.org.wildfly.gwt.sdm>14.0.1.Final</version.org.wildfly.gwt.sdm>
<!-- Patched WildFly version used for SDM with IntelliJ -->
<version.org.jboss.errai.wildfly.sdm>11.0.0.Final</version.org.jboss.errai.wildfly.sdm>
<version.org.jboss.errai.wildfly.sdm>14.0.1.Final</version.org.jboss.errai.wildfly.sdm>

<version.org.apache.activemq.artemis>2.3.0</version.org.apache.activemq.artemis>
<version.io.netty>4.1.16.Final</version.io.netty>
Expand Down Expand Up @@ -138,9 +138,17 @@
<version.org.mysql-driver>5.1.6</version.org.mysql-driver>
<version.org.postgres-driver>9.1-901.jdbc4</version.org.postgres-driver>

<!-- Required since support for ELS 2.x. Keep in sync with kie-parent or remove when those
two versions are being updated on the IP BOM.-->
<version.commons-cli>1.3.1</version.commons-cli>

<!-- required to fix RHDM-293 -->
<version.org.apache.logging.log4j.log4j-to-slf4j>2.9.0</version.org.apache.logging.log4j.log4j-to-slf4j>

<!-- this versions can be removed once these were migrated to jboss-ip-bom > 8.3.0.Final -->
<version.org.wildfly>14.0.1.Final</version.org.wildfly>
<version.org.wildfly.core>6.0.2.Final</version.org.wildfly.core>

<version.org.arquillian.cube>1.15.3</version.org.arquillian.cube>

<version.org.jboss.shrinkwrap>1.2.6</version.org.jboss.shrinkwrap>
Expand Down
5 changes: 5 additions & 0 deletions uberfire-backend/uberfire-backend-server/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,11 @@
<artifactId>jasypt</artifactId>
</dependency>

<dependency>
<groupId>xerces</groupId>
<artifactId>xercesImpl</artifactId>
</dependency>

<!-- EJB for AsyncDispatcher -->
<dependency>
<groupId>org.jboss.spec.javax.ejb</groupId>
Expand Down
3 changes: 2 additions & 1 deletion ...rg/uberfire/ext/security/management/wildfly/properties/PropertiesLineWriterPredicate.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@
*/
public class PropertiesLineWriterPredicate implements Predicate<String> {

public static final Pattern PROPERTY_PATTERN = Pattern.compile("#?+((?:[,.\\-@/a-zA-Z0-9]++|(?:\\\\[=\\\\])++)++)=(.++)");
public static final Pattern EMPTY_PROPERTY_PATTERN = Pattern.compile("#?+((?:[,.\\-@/a-zA-Z0-9]++|(?:\\\\[=\\\\])++)++)=(\\[\\].*?)*");

private final Function<String, String> keyRawValueProvider;
Expand Down Expand Up @@ -102,7 +103,7 @@ public boolean test(final String line) {
if (trimmed.length() > 0) {
Matcher userLineMatcher = null;
boolean isEmptyValue = false;
final Matcher defaultPatternMatcher = PropertiesFileLoader.PROPERTY_PATTERN.matcher(trimmed);
final Matcher defaultPatternMatcher = PROPERTY_PATTERN.matcher(trimmed);
if (defaultPatternMatcher.matches()) {
userLineMatcher = defaultPatternMatcher;
} else if (allowEmptyEntryValue) {
Expand Down