You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@syncope.apache.org by il...@apache.org on 2014/09/01 13:21:37 UTC
svn commit: r1621744 - in /syncope/trunk: ./
common/src/main/java/org/apache/syncope/common/util/CollectionWrapper.java
pom.xml
Author: ilgrosso
Date: Mon Sep 1 11:21:37 2014
New Revision: 1621744
URL: http://svn.apache.org/r1621744
Log:
Merge from 1_2_X
Modified:
syncope/trunk/ (props changed)
syncope/trunk/common/src/main/java/org/apache/syncope/common/util/CollectionWrapper.java
syncope/trunk/pom.xml
Propchange: syncope/trunk/
------------------------------------------------------------------------------
Merged /syncope/branches/1_2_X:r1621693-1621743
Modified: syncope/trunk/common/src/main/java/org/apache/syncope/common/util/CollectionWrapper.java
URL: http://svn.apache.org/viewvc/syncope/trunk/common/src/main/java/org/apache/syncope/common/util/CollectionWrapper.java?rev=1621744&r1=1621743&r2=1621744&view=diff
==============================================================================
--- syncope/trunk/common/src/main/java/org/apache/syncope/common/util/CollectionWrapper.java (original)
+++ syncope/trunk/common/src/main/java/org/apache/syncope/common/util/CollectionWrapper.java Mon Sep 1 11:21:37 2014
@@ -47,8 +47,8 @@ public final class CollectionWrapper {
return response;
}
- public static <E, T extends AbstractWrappable<E>> List<E> unwrap(final Collection<T> collection) {
- List<E> response = new ArrayList<E>();
+ public static <T extends AbstractWrappable<String>> List<String> unwrap(final Collection<T> collection) {
+ List<String> response = new ArrayList<String>();
for (T item : collection) {
response.add(item.getElement());
}
Modified: syncope/trunk/pom.xml
URL: http://svn.apache.org/viewvc/syncope/trunk/pom.xml?rev=1621744&r1=1621743&r2=1621744&view=diff
==============================================================================
--- syncope/trunk/pom.xml (original)
+++ syncope/trunk/pom.xml Mon Sep 1 11:21:37 2014
@@ -1042,7 +1042,7 @@ under the License.
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
- <version>1.3.1</version>
+ <version>1.3.2</version>
</plugin>
<plugin>
<groupId>org.apache.openjpa</groupId>
@@ -1175,7 +1175,7 @@ under the License.
<plugin>
<groupId>org.codehaus.cargo</groupId>
<artifactId>cargo-maven2-plugin</artifactId>
- <version>1.4.8</version>
+ <version>1.4.9</version>
<configuration>
<container>
<containerId>tomcat7x</containerId>
@@ -1193,7 +1193,7 @@ under the License.
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
- <version>1.8</version>
+ <version>1.9</version>
</plugin>
<plugin>
<groupId>org.zeroturnaround</groupId>
@@ -1203,7 +1203,7 @@ under the License.
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>2.4.0</version>
+ <version>2.5.0</version>
<configuration>
<supportedProjectTypes>
<supportedProjectType>jar</supportedProjectType>
@@ -1232,7 +1232,7 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-pmd-plugin</artifactId>
- <version>3.1</version>
+ <version>3.2</version>
<dependencies>
<dependency>
<groupId>org.apache.syncope</groupId>
@@ -1249,25 +1249,9 @@ under the License.
</configuration>
</plugin>
<plugin>
- <groupId>com.googlecode.maven-java-formatter-plugin</groupId>
- <artifactId>maven-java-formatter-plugin</artifactId>
- <version>0.4</version>
- <configuration>
- <configFile>org/apache/syncope/java-formatter.xml</configFile>
- </configuration>
- <dependencies>
- <dependency>
- <groupId>org.apache.syncope</groupId>
- <artifactId>syncope-build-tools</artifactId>
- <version>${project.version}</version>
- <classifier>classes</classifier>
- </dependency>
- </dependencies>
- </plugin>
- <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
- <version>2.4</version>
+ <version>2.4.1</version>
</plugin>
<plugin>
<groupId>org.eclipse.m2e</groupId>
@@ -1559,7 +1543,7 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
- <version>3.3</version>
+ <version>3.4</version>
<configuration>
<locales>en</locales>
<generateProjectInfo>false</generateProjectInfo>