This is an automated email from the ASF dual-hosted git repository.
dkulp pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cxf.git
The following commit(s) were added to refs/heads/master by this push:
new 5355846 Upgrade pmd plugin, try to detect which eclipse PMD plugin
(there are 2) is installed and configure appropriately
5355846 is described below
commit 5355846043def4fe23df92262f4791821ea9547c
Author: Daniel Kulp <[email protected]>
AuthorDate: Tue Jul 9 16:02:56 2019 -0400
Upgrade pmd plugin, try to detect which eclipse PMD plugin (there are 2) is
installed and configure appropriately
---
parent/pom.xml | 32 ++++++++++++++++++++--
.../apache/cxf/aegis/type/basic/CalendarType.java | 8 ++++--
.../apache/cxf/aegis/type/basic/DateTimeType.java | 8 ++++--
.../org/apache/cxf/aegis/type/basic/DateType.java | 8 ++++--
.../org/apache/cxf/aegis/type/basic/TimeType.java | 10 +++++--
.../apache/cxf/aegis/type/basic/TimestampType.java | 10 +++++--
.../cxf/aegis/type/basic/TimezoneLessDateType.java | 8 ++++--
7 files changed, 67 insertions(+), 17 deletions(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index fde3ea8..2c1ac17 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -337,12 +337,12 @@
<buildcommands>
<java.lang.String>org.eclipse.jdt.core.javabuilder</java.lang.String>
<java.lang.String>net.sf.eclipsecs.core.CheckstyleBuilder</java.lang.String>
-
<java.lang.String>ch.acanda.eclipse.pmd.builder.PMDBuilder</java.lang.String>
+ <java.lang.String>${PMD_BUILDER}</java.lang.String>
</buildcommands>
<projectnatures>
<nature>org.eclipse.jdt.core.javanature</nature>
<nature>net.sf.eclipsecs.core.CheckstyleNature</nature>
-
<nature>ch.acanda.eclipse.pmd.builder.PMDNature</nature>
+ <nature>${PMD_NATURE}</nature>
</projectnatures>
<ajdtVersion>none</ajdtVersion>
<additionalConfig>
@@ -407,7 +407,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-pmd-plugin</artifactId>
- <version>3.11.0</version>
+ <version>3.12.0</version>
<dependencies>
<dependency>
<groupId>org.apache.cxf.build-utils</groupId>
@@ -2646,6 +2646,32 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>setup.workspace</id>
+ <phase>initialize</phase>
+ <configuration>
+
<exportAntProperties>true</exportAntProperties>
+ <target>
+ <path id="ecp.ws.path"
location="${eclipse.workspace.dir}" />
+ <property
name="full.eclipse.workspace" refid="ecp.ws.path" />
+ <condition property="PMD_BUILDER"
value="net.sourceforge.pmd.eclipse.plugin.pmdBuilder"
else="ch.acanda.eclipse.pmd.builder.PMDBuilder">
+ <available
file="${full.eclipse.workspace}/.metadata/.plugins/org.eclipse.core.runtime/.settings/net.sourceforge.pmd.eclipse.plugin.prefs"
type="file"/>
+ </condition>
+ <condition property="PMD_NATURE"
value="net.sourceforge.pmd.eclipse.plugin.pmdNature"
else="ch.acanda.eclipse.pmd.builder.PMDNature">
+ <available
file="${full.eclipse.workspace}/.metadata/.plugins/org.eclipse.core.runtime/.settings/net.sourceforge.pmd.eclipse.plugin.prefs"
type="file"/>
+ </condition>
+ </target>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-eclipse-plugin</artifactId>
<inherited>true</inherited>
<executions>
diff --git
a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/CalendarType.java
b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/CalendarType.java
index 55842cb..0eb4b18 100644
---
a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/CalendarType.java
+++
b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/CalendarType.java
@@ -42,7 +42,9 @@ public class CalendarType extends AegisType {
}
try {
- return format.parseObject(value.trim());
+ synchronized (format) {
+ return format.parseObject(value.trim());
+ }
} catch (ParseException e) {
throw new DatabindingException("Could not parse xs:dateTime: " +
e.getMessage(), e);
}
@@ -50,6 +52,8 @@ public class CalendarType extends AegisType {
@Override
public void writeObject(Object object, MessageWriter writer, Context
context) {
- writer.writeValue(format.format(object));
+ synchronized (format) {
+ writer.writeValue(format.format(object));
+ }
}
}
diff --git
a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/DateTimeType.java
b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/DateTimeType.java
index 22dd728..7bd2557 100644
---
a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/DateTimeType.java
+++
b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/DateTimeType.java
@@ -49,7 +49,9 @@ public class DateTimeType extends AegisType {
}
try {
- return ((Calendar)format.parseObject(value.trim())).getTime();
+ synchronized (format) {
+ return ((Calendar)format.parseObject(value.trim())).getTime();
+ }
} catch (ParseException e) {
throw new DatabindingException("Could not parse xs:dateTime: " +
e.getMessage(), e);
}
@@ -59,6 +61,8 @@ public class DateTimeType extends AegisType {
public void writeObject(Object object, MessageWriter writer, Context
context) {
Calendar c = Calendar.getInstance();
c.setTime((Date)object);
- writer.writeValue(format.format(c));
+ synchronized (format) {
+ writer.writeValue(format.format(c));
+ }
}
}
diff --git
a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/DateType.java
b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/DateType.java
index 2340efc..acd14d7 100644
---
a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/DateType.java
+++
b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/DateType.java
@@ -45,7 +45,9 @@ public class DateType extends AegisType {
}
try {
- return ((Calendar)format.parseObject(value.trim())).getTime();
+ synchronized (format) {
+ return ((Calendar)format.parseObject(value.trim())).getTime();
+ }
} catch (ParseException e) {
throw new DatabindingException("Could not parse xs:dat: " +
e.getMessage(), e);
}
@@ -55,6 +57,8 @@ public class DateType extends AegisType {
public void writeObject(Object object, MessageWriter writer, Context
context) {
Calendar c = Calendar.getInstance();
c.setTime((Date)object);
- writer.writeValue(format.format(c));
+ synchronized (format) {
+ writer.writeValue(format.format(c));
+ }
}
}
diff --git
a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/TimeType.java
b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/TimeType.java
index 81c65af..424fa60 100644
---
a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/TimeType.java
+++
b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/TimeType.java
@@ -44,8 +44,10 @@ public class TimeType extends AegisType {
}
try {
- Calendar c = (Calendar)format.parseObject(value.trim());
- return new Time(c.getTimeInMillis());
+ synchronized (format) {
+ Calendar c = (Calendar)format.parseObject(value.trim());
+ return new Time(c.getTimeInMillis());
+ }
} catch (ParseException e) {
throw new DatabindingException("Could not parse xs:dateTime: " +
e.getMessage(), e);
}
@@ -55,6 +57,8 @@ public class TimeType extends AegisType {
public void writeObject(Object object, MessageWriter writer, Context
context) {
Calendar c = Calendar.getInstance();
c.setTime((Time)object);
- writer.writeValue(format.format(c));
+ synchronized (format) {
+ writer.writeValue(format.format(c));
+ }
}
}
diff --git
a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/TimestampType.java
b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/TimestampType.java
index 4b162c5..ff75860 100644
---
a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/TimestampType.java
+++
b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/TimestampType.java
@@ -44,8 +44,10 @@ public class TimestampType extends AegisType {
}
try {
- Calendar c = (Calendar)format.parseObject(value.trim());
- return new Timestamp(c.getTimeInMillis());
+ synchronized (format) {
+ Calendar c = (Calendar)format.parseObject(value.trim());
+ return new Timestamp(c.getTimeInMillis());
+ }
} catch (ParseException e) {
throw new DatabindingException("Could not parse xs:dateTime: " +
e.getMessage(), e);
}
@@ -55,6 +57,8 @@ public class TimestampType extends AegisType {
public void writeObject(Object object, MessageWriter writer, Context
context) {
Calendar c = Calendar.getInstance();
c.setTime((Timestamp)object);
- writer.writeValue(format.format(c));
+ synchronized (format) {
+ writer.writeValue(format.format(c));
+ }
}
}
diff --git
a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/TimezoneLessDateType.java
b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/TimezoneLessDateType.java
index 07ba378..8ae0cf0 100644
---
a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/TimezoneLessDateType.java
+++
b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/TimezoneLessDateType.java
@@ -44,7 +44,9 @@ public class TimezoneLessDateType extends DateType {
}
try {
- return ((Calendar)format.parseObject(value.trim())).getTime();
+ synchronized (format) {
+ return ((Calendar)format.parseObject(value.trim())).getTime();
+ }
} catch (ParseException e) {
throw new DatabindingException("Could not parse xs:date: " +
e.getMessage(), e);
}
@@ -59,6 +61,8 @@ public class TimezoneLessDateType extends DateType {
c = Calendar.getInstance();
c.setTime((Date) object);
}
- writer.writeValue(format.format(c));
+ synchronized (format) {
+ writer.writeValue(format.format(c));
+ }
}
}
