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 2012/09/10 09:08:02 UTC
svn commit: r1382665 - in /incubator/syncope/branches/1_0_X:
build-tools/pom.xml client/pom.xml console/pom.xml core/pom.xml
parent/pom.xml
Author: ilgrosso
Date: Mon Sep 10 07:08:01 2012
New Revision: 1382665
URL: http://svn.apache.org/viewvc?rev=1382665&view=rev
Log:
[SYNCOPE-203] Reverting provided patch from branch 1_0_X (keep on trunk only)
Modified:
incubator/syncope/branches/1_0_X/build-tools/pom.xml
incubator/syncope/branches/1_0_X/client/pom.xml
incubator/syncope/branches/1_0_X/console/pom.xml
incubator/syncope/branches/1_0_X/core/pom.xml
incubator/syncope/branches/1_0_X/parent/pom.xml
Modified: incubator/syncope/branches/1_0_X/build-tools/pom.xml
URL: http://svn.apache.org/viewvc/incubator/syncope/branches/1_0_X/build-tools/pom.xml?rev=1382665&r1=1382664&r2=1382665&view=diff
==============================================================================
--- incubator/syncope/branches/1_0_X/build-tools/pom.xml (original)
+++ incubator/syncope/branches/1_0_X/build-tools/pom.xml Mon Sep 10 07:08:01 2012
@@ -106,9 +106,6 @@ under the License.
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
<configuration>
- <archive>
- <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
- </archive>
<webResources>
<webResource>
<directory>${basedir}/src/main/webapp/WEB-INF</directory>
@@ -148,39 +145,6 @@ under the License.
</deployables>
</configuration>
</plugin>
-
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <executions>
- <execution>
- <id>bundle-manifest</id>
- <phase>process-classes</phase>
- <goals>
- <goal>manifest</goal>
- </goals>
- <configuration>
- <instructions>
- <Bundle-Name>${project.name}</Bundle-Name>
- <Bundle-SymbolicName>org.apache.syncope.buildtools</Bundle-SymbolicName>
- <Bundle-Version>${project.version}</Bundle-Version>
- <Export-Package>
- org.apache.syncope.buildtools*;version=${project.version};-split-package:=merge-first
- </Export-Package>
- <Import-Package>
- javax.naming*,
- javax.servlet*,
- javax.sql,
- org.springframework*;version="[3,4)",
- org.apache.directory*;version="[0.9,2)";resolution:=optional,
- org.h2.tools;version="[1.3,2)";resolution:=optional,
- org.slf4j;resolution:=optional
- </Import-Package>
- </instructions>
- </configuration>
- </execution>
- </executions>
- </plugin>
</plugins>
<resources>
Modified: incubator/syncope/branches/1_0_X/client/pom.xml
URL: http://svn.apache.org/viewvc/incubator/syncope/branches/1_0_X/client/pom.xml?rev=1382665&r1=1382664&r2=1382665&view=diff
==============================================================================
--- incubator/syncope/branches/1_0_X/client/pom.xml (original)
+++ incubator/syncope/branches/1_0_X/client/pom.xml Mon Sep 10 07:08:01 2012
@@ -33,7 +33,7 @@ under the License.
<description>Apache Syncope Client</description>
<groupId>org.apache.syncope</groupId>
<artifactId>syncope-client</artifactId>
- <packaging>bundle</packaging>
+ <packaging>jar</packaging>
<distributionManagement>
<site>
@@ -99,33 +99,6 @@ under the License.
</includes>
</resource>
</resources>
- <plugins>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <extensions>true</extensions>
- <configuration>
- <instructions>
- <Bundle-Name>${project.name}</Bundle-Name>
- <Bundle-SymbolicName>org.apache.syncope.client</Bundle-SymbolicName>
- <Bundle-Version>${project.version}</Bundle-Version>
- <Export-Package>
- org.apache.syncope*;version=${project.version};-split-package:=merge-first
- </Export-Package>
- <Import-Package>
- com.thoughtworks.xstream;version="[1.4,2)",
- org.apache.commons.lang*;version="[2.6,3)",
- org.apache.http*;version="[4,5)",
- org.codehaus.jackson.annotate;version="[1.9,2)",
- org.springframework*;version="[3,4)",
- ch.qos.logback.classic;resolution:=optional,
- org.slf4j;resolution:=optional
- </Import-Package>
- </instructions>
- </configuration>
- </plugin>
-
- </plugins>
</build>
<reporting>
Modified: incubator/syncope/branches/1_0_X/console/pom.xml
URL: http://svn.apache.org/viewvc/incubator/syncope/branches/1_0_X/console/pom.xml?rev=1382665&r1=1382664&r2=1382665&view=diff
==============================================================================
--- incubator/syncope/branches/1_0_X/console/pom.xml (original)
+++ incubator/syncope/branches/1_0_X/console/pom.xml Mon Sep 10 07:08:01 2012
@@ -350,57 +350,6 @@ under the License.
</deployables>
</configuration>
</plugin>
-
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <executions>
- <execution>
- <id>bundle-manifest</id>
- <phase>process-classes</phase>
- <goals>
- <goal>manifest</goal>
- </goals>
- <configuration>
- <instructions>
- <Bundle-Name>${project.name}</Bundle-Name>
- <Bundle-SymbolicName>org.apache.syncope.console</Bundle-SymbolicName>
- <Bundle-Version>${project.version}</Bundle-Version>
- <Export-Package>
- org.apache.syncope.console*;version=${project.version};-split-package:=merge-first
- </Export-Package>
- <Import-Package>
- javax.servlet,
- javax.xml*,
- org.w3c.dom,
- org.apache.commons.lang*;version="[2.6,3)",
- org.apache.http*;version="[4,5)",
- org.apache.syncope.annotation;version=${project.version},
- org.apache.syncope.client*;version=${project.version},
- org.apache.syncope.types;version=${project.version},
- org.apache.wicket*;version="[1.5,2)",
- org.codehaus.jackson*;version="[1.9,2)",
- org.springframework*;version="[3,4)",
- ch.qos.logback.classic;resolution:=optional,
- javax.swing.tree;resolution:=optional,
- org.slf4j;resolution:=optional
- </Import-Package>
- </instructions>
- </configuration>
- </execution>
- </executions>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-war-plugin</artifactId>
- <configuration>
- <archive>
- <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
- </archive>
- </configuration>
- </plugin>
-
</plugins>
<resources>
Modified: incubator/syncope/branches/1_0_X/core/pom.xml
URL: http://svn.apache.org/viewvc/incubator/syncope/branches/1_0_X/core/pom.xml?rev=1382665&r1=1382664&r2=1382665&view=diff
==============================================================================
--- incubator/syncope/branches/1_0_X/core/pom.xml (original)
+++ incubator/syncope/branches/1_0_X/core/pom.xml Mon Sep 10 07:08:01 2012
@@ -610,73 +610,6 @@ under the License.
<showDeprecation>true</showDeprecation>
</configuration>
</plugin>
-
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <executions>
- <execution>
- <id>bundle-manifest</id>
- <phase>process-classes</phase>
- <goals>
- <goal>manifest</goal>
- </goals>
- <configuration>
- <instructions>
- <Bundle-Name>${project.name}</Bundle-Name>
- <Bundle-SymbolicName>org.apache.syncope.core</Bundle-SymbolicName>
- <Bundle-Version>${project.version}</Bundle-Version>
- <Export-Package>
- org.apache.syncope.core*;version=${project.version};-split-package:=merge-first
- </Export-Package>
- <Import-Package>
- javax.annotation,
- javax.crypto*,
- javax.mail.internet,
- javax.naming,
- javax.persistence,
- javax.rmi,
- javax.servlet*,
- javax.sql,
- javax.validation*,
- javax.xml*,
- org.w3c.dom,
- org.xml.sax*,
- org.activiti*;version="[5,6)",
- org.apache.cocoon*;version="[2,4)",
- org.apache.commons.collections.keyvalue;version="[3.2,4)",
- org.apache.commons.io;version="[1.3,2)",
- org.apache.commons.jexl2*;version="[2.1,3)",
- org.apache.commons.lang*;version="[2.6,3)",
- org.apache.openjpa*;version="[2,3)",
- org.apache.syncope.client*;version=${project.version},
- org.apache.syncope.types;version=${project.version},
- org.apache.velocity*;version="[1.7,2)",
- org.aspectj.lang*;version="[1.7,2)",
- org.codehaus.jackson*;version="[1.9,2)",
- org.jasypt.digest;version="[1.9,2)",
- org.quartz*;version="[1.8,2)",
- org.springframework*;version="[3,4)",
- ch.qos.logback*;resolution:=optional,
- org.identityconnectors*;resolution:=optional,
- org.slf4j;resolution:=optional
- </Import-Package>
- </instructions>
- </configuration>
- </execution>
- </executions>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-war-plugin</artifactId>
- <configuration>
- <archive>
- <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
- </archive>
- </configuration>
- </plugin>
-
</plugins>
<resources>
Modified: incubator/syncope/branches/1_0_X/parent/pom.xml
URL: http://svn.apache.org/viewvc/incubator/syncope/branches/1_0_X/parent/pom.xml?rev=1382665&r1=1382664&r2=1382665&view=diff
==============================================================================
--- incubator/syncope/branches/1_0_X/parent/pom.xml (original)
+++ incubator/syncope/branches/1_0_X/parent/pom.xml Mon Sep 10 07:08:01 2012
@@ -906,18 +906,6 @@ under the License.
<artifactId>jrebel-maven-plugin</artifactId>
<version>1.1.3</version>
</plugin>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <version>2.3.7</version>
- <configuration>
- <supportedProjectTypes>
- <supportedProjectType>jar</supportedProjectType>
- <supportedProjectType>war</supportedProjectType>
- <supportedProjectType>bundle</supportedProjectType>
- </supportedProjectTypes>
- </configuration>
- </plugin>
</plugins>
</pluginManagement>
@@ -1059,7 +1047,6 @@ under the License.
<artifactId>maven-jxr-plugin</artifactId>
<version>2.3</version>
</plugin>
-
</plugins>
</build>