You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by so...@apache.org on 2016/08/25 15:57:49 UTC

svn commit: r1757720 - in /openmeetings/application: branches/3.1.x/openmeetings-screenshare/pom.xml branches/3.2.x/openmeetings-screenshare/pom.xml trunk/openmeetings-screenshare/pom.xml

Author: solomax
Date: Thu Aug 25 15:57:49 2016
New Revision: 1757720

URL: http://svn.apache.org/viewvc?rev=1757720&view=rev
Log:
no jira: dependency to outdated bcprov is removed

Modified:
    openmeetings/application/branches/3.1.x/openmeetings-screenshare/pom.xml
    openmeetings/application/branches/3.2.x/openmeetings-screenshare/pom.xml
    openmeetings/application/trunk/openmeetings-screenshare/pom.xml

Modified: openmeetings/application/branches/3.1.x/openmeetings-screenshare/pom.xml
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-screenshare/pom.xml?rev=1757720&r1=1757719&r2=1757720&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-screenshare/pom.xml (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-screenshare/pom.xml Thu Aug 25 15:57:49 2016
@@ -38,7 +38,6 @@
 		<site.basedir>${project.parent.basedir}</site.basedir>
 		<skip.site.copy>false</skip.site.copy>
 		<jnlp.out.dir>${project.build.directory}/jnlp</jnlp.out.dir>
-		<share.bcprov.version>1.52</share.bcprov.version>
 	</properties>
 	<dependencies>
 		<dependency>
@@ -54,11 +53,6 @@
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-core</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>org.bouncycastle</groupId>
-			<artifactId>bcprov-jdk15on</artifactId>
-			<version>${share.bcprov.version}</version>
-		</dependency>
 	</dependencies>
 	<build>
 		<plugins>
@@ -189,20 +183,15 @@
 						<id>copy-bcprov</id>
 						<phase>prepare-package</phase>
 						<goals>
-							<goal>copy</goal>
+							<goal>copy-dependencies</goal>
 						</goals>
 						<configuration>
 							<outputDirectory>${jnlp.out.dir}</outputDirectory>
-							<artifactItems>
-								<artifactItem>
-									<groupId>org.bouncycastle</groupId>
-									<artifactId>bcprov-jdk15on</artifactId>
-								</artifactItem>
-							</artifactItems>
+							<includeArtifactIds>bcprov-jdk15on</includeArtifactIds>
 							<overWriteReleases>true</overWriteReleases>
 							<overWriteSnapshots>true</overWriteSnapshots>
 							<overWriteIfNewer>true</overWriteIfNewer>
-							<excludeTransitive>true</excludeTransitive>
+							<excludeTransitive>false</excludeTransitive>
 						</configuration>
 					</execution>
 				</executions>

Modified: openmeetings/application/branches/3.2.x/openmeetings-screenshare/pom.xml
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-screenshare/pom.xml?rev=1757720&r1=1757719&r2=1757720&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-screenshare/pom.xml (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-screenshare/pom.xml Thu Aug 25 15:57:49 2016
@@ -38,7 +38,6 @@
 		<site.basedir>${project.parent.basedir}</site.basedir>
 		<skip.site.copy>false</skip.site.copy>
 		<jnlp.out.dir>${project.build.directory}/jnlp</jnlp.out.dir>
-		<share.bcprov.version>1.52</share.bcprov.version>
 	</properties>
 	<dependencies>
 		<dependency>
@@ -54,11 +53,6 @@
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-core</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>org.bouncycastle</groupId>
-			<artifactId>bcprov-jdk15on</artifactId>
-			<version>${share.bcprov.version}</version>
-		</dependency>
 	</dependencies>
 	<build>
 		<plugins>
@@ -189,20 +183,15 @@
 						<id>copy-bcprov</id>
 						<phase>prepare-package</phase>
 						<goals>
-							<goal>copy</goal>
+							<goal>copy-dependencies</goal>
 						</goals>
 						<configuration>
 							<outputDirectory>${jnlp.out.dir}</outputDirectory>
-							<artifactItems>
-								<artifactItem>
-									<groupId>org.bouncycastle</groupId>
-									<artifactId>bcprov-jdk15on</artifactId>
-								</artifactItem>
-							</artifactItems>
+							<includeArtifactIds>bcprov-jdk15on</includeArtifactIds>
 							<overWriteReleases>true</overWriteReleases>
 							<overWriteSnapshots>true</overWriteSnapshots>
 							<overWriteIfNewer>true</overWriteIfNewer>
-							<excludeTransitive>true</excludeTransitive>
+							<excludeTransitive>false</excludeTransitive>
 						</configuration>
 					</execution>
 				</executions>

Modified: openmeetings/application/trunk/openmeetings-screenshare/pom.xml
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-screenshare/pom.xml?rev=1757720&r1=1757719&r2=1757720&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-screenshare/pom.xml (original)
+++ openmeetings/application/trunk/openmeetings-screenshare/pom.xml Thu Aug 25 15:57:49 2016
@@ -38,7 +38,6 @@
 		<site.basedir>${project.parent.basedir}</site.basedir>
 		<skip.site.copy>false</skip.site.copy>
 		<jnlp.out.dir>${project.build.directory}/jnlp</jnlp.out.dir>
-		<share.bcprov.version>1.52</share.bcprov.version>
 	</properties>
 	<dependencies>
 		<dependency>
@@ -54,11 +53,6 @@
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-core</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>org.bouncycastle</groupId>
-			<artifactId>bcprov-jdk15on</artifactId>
-			<version>${share.bcprov.version}</version>
-		</dependency>
 	</dependencies>
 	<build>
 		<plugins>
@@ -189,20 +183,15 @@
 						<id>copy-bcprov</id>
 						<phase>prepare-package</phase>
 						<goals>
-							<goal>copy</goal>
+							<goal>copy-dependencies</goal>
 						</goals>
 						<configuration>
 							<outputDirectory>${jnlp.out.dir}</outputDirectory>
-							<artifactItems>
-								<artifactItem>
-									<groupId>org.bouncycastle</groupId>
-									<artifactId>bcprov-jdk15on</artifactId>
-								</artifactItem>
-							</artifactItems>
+							<includeArtifactIds>bcprov-jdk15on</includeArtifactIds>
 							<overWriteReleases>true</overWriteReleases>
 							<overWriteSnapshots>true</overWriteSnapshots>
 							<overWriteIfNewer>true</overWriteIfNewer>
-							<excludeTransitive>true</excludeTransitive>
+							<excludeTransitive>false</excludeTransitive>
 						</configuration>
 					</execution>
 				</executions>