Merged
diff --git a/modules/resolver/src/test/java/org/apache/tamaya/resolver/ManualSetupTest.java b/modules/resolver/src/test/java/org/apache/tamaya/resolver/ManualSetupTest.java
index d8f323f..b08b236 100644
--- a/modules/resolver/src/test/java/org/apache/tamaya/resolver/ManualSetupTest.java
+++ b/modules/resolver/src/test/java/org/apache/tamaya/resolver/ManualSetupTest.java
@@ -43,8 +43,13 @@
PropertyValue unfiltered = reolverFilter.filterProperty(PropertyValue.createValue("foo", "${url:cccabABabbaaaba}"), null);
assertThat(filtered).isNotNull();
assertThat(unfiltered).isNotNull();
+<<<<<<< HEAD
+ assertThat(filtered.getValue()).isNotNull().isEqualTo("CCCBBABBBBBBBBB");
+ assertThat(unfiltered.getValue()).isNotNull().isEqualTo("?{url:cccabABabbaaaba}");
+=======
assertThat(filtered.getValue()).isEqualTo("CCCBBABBBBBBBBB");
assertThat(unfiltered.getValue()).isEqualTo("?{url:cccabABabbaaaba}");
+>>>>>>> release-0.4-incubating
}
private static final class CustomResolver implements ExpressionResolver{
diff --git a/pom.xml b/pom.xml
index 6a6c08a..038c250 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,11 +21,11 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache</groupId>
- <artifactId>apache</artifactId>
- <version>20</version>
- </parent>
+ <parent>
+ <groupId>org.apache</groupId>
+ <artifactId>apache</artifactId>
+ <version>20</version>
+ </parent>
<groupId>org.apache.tamaya.ext</groupId>
<artifactId>tamaya-extensions-all</artifactId>
@@ -206,13 +206,13 @@
</developer>
<developer>
- <id>acoburn</id>
- <name>Aaron Coburn</name>
- <email>acoburn AT apache.org</email>
- <roles>
- <role>Committer</role>
- </roles>
- <timezone>-5</timezone>
+ <id>acoburn</id>
+ <name>Aaron Coburn</name>
+ <email>acoburn AT apache.org</email>
+ <roles>
+ <role>Committer</role>
+ </roles>
+ <timezone>-5</timezone>
</developer>
</developers>
@@ -341,7 +341,7 @@
<build>
- <defaultGoal>clean install</defaultGoal>
+ <defaultGoal>clean install</defaultGoal>
<pluginManagement>
<plugins>
<plugin>
@@ -378,7 +378,9 @@
<execution>
<id>report</id>
<phase>package</phase>
- <goals><goal>report</goal></goals>
+ <goals>
+ <goal>report</goal>
+ </goals>
</execution>
</executions>
</plugin>
@@ -409,7 +411,8 @@
<configuration>
<logViolationsToConsole>true</logViolationsToConsole>
<includeTestSourceDirectory>true</includeTestSourceDirectory>
- <suppressionsLocation>buildtools/src/main/resources/checkstyle/suppressions.xml</suppressionsLocation>
+ <suppressionsLocation>buildtools/src/main/resources/checkstyle/suppressions.xml
+ </suppressionsLocation>
<configLocation>buildtools/src/main/resources/checkstyle/style.xml</configLocation>
</configuration>
@@ -452,7 +455,8 @@
<effort>Max</effort>
<threshold>Low</threshold>
<failOnError>true</failOnError>
- <excludeFilterFile>buildtools/src/main/resources/findbugs/findbugs-exclude.xml</excludeFilterFile>
+ <excludeFilterFile>buildtools/src/main/resources/findbugs/findbugs-exclude.xml
+ </excludeFilterFile>
</configuration>
</plugin>
@@ -533,7 +537,7 @@
<manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
<addMavenDescriptor>false</addMavenDescriptor>
<manifest>
- <addDefaultImplementationEntries>false</addDefaultImplementationEntries>
+ <addDefaultImplementationEntries>false</addDefaultImplementationEntries>
</manifest>
<manifestEntries>
<Specification-Title>Apache ${project.name}</Specification-Title>
@@ -706,16 +710,16 @@
<!-- compiling on JDK 9+ requires these Java EE modules
it should be possible to remove this after Karaf 4.2.0 GA has been released -->
<dependencies>
- <dependency>
- <groupId>org.glassfish.jaxb</groupId>
- <artifactId>jaxb-runtime</artifactId>
- <version>2.3.0</version>
- </dependency>
- <dependency>
- <groupId>javax.activation</groupId>
- <artifactId>javax.activation-api</artifactId>
- <version>1.2.0</version>
- </dependency>
+ <dependency>
+ <groupId>org.glassfish.jaxb</groupId>
+ <artifactId>jaxb-runtime</artifactId>
+ <version>2.3.0</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.activation</groupId>
+ <artifactId>javax.activation-api</artifactId>
+ <version>1.2.0</version>
+ </dependency>
</dependencies>
</plugin>
@@ -795,11 +799,11 @@
<!-- compiling on JDK 10 requires a newer version of commons-lang3
it should be possible to remove this once a newer javadoc plugin becomes available -->
<dependencies>
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-lang3</artifactId>
- <version>3.7</version>
- </dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-lang3</artifactId>
+ <version>3.7</version>
+ </dependency>
</dependencies>
</plugin>
@@ -1101,14 +1105,14 @@
</plugins>
</reporting>
<repositories>
- <repository>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- <id>maven-central</id>
- <name>Maven Central Repository</name>
- <url>https://repo1.maven.org/maven2</url>
- </repository>
+ <repository>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ <id>maven-central</id>
+ <name>Maven Central Repository</name>
+ <url>https://repo1.maven.org/maven2</url>
+ </repository>
</repositories>
</project>
