You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by cz...@apache.org on 2017/01/12 06:05:14 UTC
svn commit: r1778375 - in /felix/trunk/utils: doc/changelog.txt pom.xml
src/main/java/org/apache/felix/utils/properties/InterpolationHelper.java
Author: cziegeler
Date: Thu Jan 12 06:05:13 2017
New Revision: 1778375
URL: http://svn.apache.org/viewvc?rev=1778375&view=rev
Log:
FELIX-5487 : Utils code requires Java 6 - should be Java 5
Modified:
felix/trunk/utils/doc/changelog.txt
felix/trunk/utils/pom.xml
felix/trunk/utils/src/main/java/org/apache/felix/utils/properties/InterpolationHelper.java
Modified: felix/trunk/utils/doc/changelog.txt
URL: http://svn.apache.org/viewvc/felix/trunk/utils/doc/changelog.txt?rev=1778375&r1=1778374&r2=1778375&view=diff
==============================================================================
--- felix/trunk/utils/doc/changelog.txt (original)
+++ felix/trunk/utils/doc/changelog.txt Thu Jan 12 06:05:13 2017
@@ -3,6 +3,8 @@ Changes from 1.8.4 to 1.8.6
** Improvement
* [FELIX-5474] - Do not call no-arg Bundle.getHeaders() method
* [FELIX-5434] - Add an update method to Properties
+** Bug
+ * [FELIX-5487] - Utils code requires Java 6 - should be Java 5
Changes from 1.8.4 to 1.8.6
Modified: felix/trunk/utils/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/utils/pom.xml?rev=1778375&r1=1778374&r2=1778375&view=diff
==============================================================================
--- felix/trunk/utils/pom.xml (original)
+++ felix/trunk/utils/pom.xml Thu Jan 12 06:05:13 2017
@@ -20,76 +20,53 @@
<parent>
<groupId>org.apache.felix</groupId>
<artifactId>felix-parent</artifactId>
- <version>2.1</version>
+ <version>4</version>
+ <relativePath/>
</parent>
-
- <modelVersion>4.0.0</modelVersion>
- <name>Apache Felix Utils</name>
- <description>Utility classes for OSGi.</description>
- <version>1.8.5-SNAPSHOT</version>
- <artifactId>org.apache.felix.utils</artifactId>
- <scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/felix/trunk/utils</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/felix/trunk/utils</developerConnection>
- <url>http://svn.apache.org/repos/asf/felix/utils</url>
- </scm>
- <dependencies>
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
- <version>4.1.0</version>
- </dependency>
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.compendium</artifactId>
- <version>4.2.0</version>
- </dependency>
- </dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-source-plugin</artifactId>
- <version>2.2.1</version>
- <executions>
- <execution>
- <id>attach-sources</id>
- <phase>prepare-package</phase>
- <goals>
- <goal>jar-no-fork</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>rat-maven-plugin</artifactId>
- <configuration>
- <excludeSubProjects>false</excludeSubProjects>
- <useEclipseDefaultExcludes>true</useEclipseDefaultExcludes>
- <useMavenDefaultExcludes>true</useMavenDefaultExcludes>
- <excludes>
- <param>doc/*</param>
- <param>maven-eclipse.xml</param>
- <param>.checkstyle</param>
- <param>.externalToolBuilders/*</param>
- </excludes>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <configuration>
- <additionalparam>-Xdoclint:none</additionalparam>
- </configuration>
- </plugin>
- </plugins>
- </build>
+
+ <modelVersion>4.0.0</modelVersion>
+ <name>Apache Felix Utils</name>
+ <description>Utility classes for OSGi.</description>
+ <version>1.8.5-SNAPSHOT</version>
+ <artifactId>org.apache.felix.utils</artifactId>
+
+ <scm>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/felix/trunk/utils</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/felix/trunk/utils</developerConnection>
+ <url>http://svn.apache.org/repos/asf/felix/utils</url>
+ </scm>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.core</artifactId>
+ <version>4.1.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.compendium</artifactId>
+ <version>4.2.0</version>
+ </dependency>
+ </dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.rat</groupId>
+ <artifactId>apache-rat-plugin</artifactId>
+ <configuration>
+ <excludes combine.children="append">
+ <!-- Exclude all JSON files -->
+ <exclude>doc/*</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <configuration>
+ <additionalparam>-Xdoclint:none</additionalparam>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</project>
Modified: felix/trunk/utils/src/main/java/org/apache/felix/utils/properties/InterpolationHelper.java
URL: http://svn.apache.org/viewvc/felix/trunk/utils/src/main/java/org/apache/felix/utils/properties/InterpolationHelper.java?rev=1778375&r1=1778374&r2=1778375&view=diff
==============================================================================
--- felix/trunk/utils/src/main/java/org/apache/felix/utils/properties/InterpolationHelper.java (original)
+++ felix/trunk/utils/src/main/java/org/apache/felix/utils/properties/InterpolationHelper.java Thu Jan 12 06:05:13 2017
@@ -345,14 +345,14 @@ public class InterpolationHelper {
{
if (op.startsWith(":-"))
{
- if (substValue == null || substValue.isEmpty())
+ if (substValue == null || substValue.length() == 0 )
{
substValue = op.substring(":-".length());
}
}
else if (op.startsWith(":+"))
{
- if (substValue != null && !substValue.isEmpty())
+ if (substValue != null && substValue.length() != 0)
{
substValue = op.substring(":+".length());
}