Author: solomax
Date: Tue Dec 22 02:23:19 2015
New Revision: 1721292
URL: http://svn.apache.org/viewvc?rev=1721292&view=rev
Log:
[OPENMEETINGS-1302] source artifact is now created
Added:
openmeetings/application/branches/3.1.x/openmeetings-server/src/main/assembly/src.xml
openmeetings/application/trunk/openmeetings-server/src/main/assembly/src.xml
Modified:
openmeetings/application/branches/3.1.x/openmeetings-flash/pom.xml
openmeetings/application/branches/3.1.x/openmeetings-server/pom.xml
openmeetings/application/branches/3.1.x/pom.xml
openmeetings/application/trunk/openmeetings-flash/pom.xml
openmeetings/application/trunk/openmeetings-server/pom.xml
openmeetings/application/trunk/pom.xml
Modified: openmeetings/application/branches/3.1.x/openmeetings-flash/pom.xml
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-flash/pom.xml?rev=1721292&r1=1721291&r2=1721292&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-flash/pom.xml
(original)
+++ openmeetings/application/branches/3.1.x/openmeetings-flash/pom.xml Tue Dec
22 02:23:19 2015
@@ -110,7 +110,7 @@
<artifactId>maven-antrun-plugin</artifactId>
<executions>
<execution>
- <phase>package</phase>
+ <phase>compile</phase>
<configuration>
<exportAntProperties>true</exportAntProperties>
<target>
Modified: openmeetings/application/branches/3.1.x/openmeetings-server/pom.xml
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-server/pom.xml?rev=1721292&r1=1721291&r2=1721292&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-server/pom.xml
(original)
+++ openmeetings/application/branches/3.1.x/openmeetings-server/pom.xml Tue Dec
22 02:23:19 2015
@@ -121,6 +121,7 @@
<maven.test.skip>true</maven.test.skip>
<assembly.finalName>server</assembly.finalName>
<assembly.descriptor>unpacked</assembly.descriptor>
+ <src.pack.skip>true</src.pack.skip>
</properties>
</profile>
<profile>
@@ -212,18 +213,34 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
- <configuration>
- <descriptors>
-
<descriptor>${project.basedir}/src/main/assembly/${assembly.descriptor}.xml</descriptor>
- </descriptors>
-
<finalName>${assembly.finalName}</finalName>
-
<appendAssemblyId>false</appendAssemblyId>
- <tarLongFileMode>gnu</tarLongFileMode>
- </configuration>
<executions>
<execution>
<id>make-assembly</id>
<phase>package</phase>
+ <configuration>
+ <descriptors>
+
<descriptor>${project.basedir}/src/main/assembly/${assembly.descriptor}.xml</descriptor>
+ </descriptors>
+
<finalName>${assembly.finalName}</finalName>
+
<appendAssemblyId>false</appendAssemblyId>
+
<tarLongFileMode>gnu</tarLongFileMode>
+ </configuration>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>make-src</id>
+ <phase>package</phase>
+ <configuration>
+ <descriptors>
+
<descriptor>${project.basedir}/src/main/assembly/src.xml</descriptor>
+ </descriptors>
+
<finalName>${project.build.finalName}</finalName>
+
<appendAssemblyId>true</appendAssemblyId>
+
<tarLongFileMode>gnu</tarLongFileMode>
+
<skipAssembly>${src.pack.skip}</skipAssembly>
+ </configuration>
<goals>
<goal>single</goal>
</goals>
Added:
openmeetings/application/branches/3.1.x/openmeetings-server/src/main/assembly/src.xml
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-server/src/main/assembly/src.xml?rev=1721292&view=auto
==============================================================================
---
openmeetings/application/branches/3.1.x/openmeetings-server/src/main/assembly/src.xml
(added)
+++
openmeetings/application/branches/3.1.x/openmeetings-server/src/main/assembly/src.xml
Tue Dec 22 02:23:19 2015
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<assembly
+
xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2
http://maven.apache.org/xsd/assembly-1.1.2.xsd">
+ <id>src</id>
+ <formats>
+ <format>tar.gz</format>
+ <format>zip</format>
+ </formats>
+ <includeBaseDirectory>false</includeBaseDirectory>
+ <fileSets>
+ <fileSet>
+ <directory>${project.parent.basedir}</directory>
+ <outputDirectory></outputDirectory>
+ <useDefaultExcludes>true</useDefaultExcludes>
+ <includes>
+ <include>*.xml</include>
+ <include>CHANGELOG</include>
+ <include>LICENSE</include>
+ <include>NOTICE</include>
+ <include>README</include>
+ <include>openmeetings-*/**</include>
+ </includes>
+ <excludes>
+ <exclude>**/openmeetings-*/target/**</exclude>
+
<exclude>openmeetings-flash/openlaszlo/**</exclude>
+
<exclude>openmeetings-server/red5-server/**</exclude>
+ <exclude>openmeetings-web/test-data/**</exclude>
+ <exclude>**/.classpath/**</exclude>
+ <exclude>**/.project/**</exclude>
+ <exclude>**/.settings/**</exclude>
+ </excludes>
+ </fileSet>
+ </fileSets>
+</assembly>
Modified: openmeetings/application/branches/3.1.x/pom.xml
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/pom.xml?rev=1721292&r1=1721291&r2=1721292&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/pom.xml (original)
+++ openmeetings/application/branches/3.1.x/pom.xml Tue Dec 22 02:23:19 2015
@@ -55,6 +55,7 @@
<jettison.version>1.3.5</jettison.version>
<site.basedir>${project.basedir}</site.basedir>
<skip.site.copy>true</skip.site.copy>
+ <src.pack.skip>false</src.pack.skip>
</properties>
<modules>
<module>openmeetings-util</module>
@@ -83,6 +84,7 @@
<old-backups.dwnd.skip>true</old-backups.dwnd.skip>
<red5-server.dwnd.skip>true</red5-server.dwnd.skip>
<wicket.mode>DEVELOPMENT</wicket.mode>
+ <src.pack.skip>true</src.pack.skip>
</properties>
</profile>
<profile>
Modified: openmeetings/application/trunk/openmeetings-flash/pom.xml
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-flash/pom.xml?rev=1721292&r1=1721291&r2=1721292&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-flash/pom.xml (original)
+++ openmeetings/application/trunk/openmeetings-flash/pom.xml Tue Dec 22
02:23:19 2015
@@ -31,7 +31,6 @@
<description>TODO</description>
<properties>
<openlaszlo>${project.basedir}/openlaszlo</openlaszlo>
- <laszlo46.home>${openlaszlo}/openlaszlo46</laszlo46.home>
<out.dir.swf>${project.build.directory}</out.dir.swf>
<webcontent.base.dir>${project.basedir}/src/main</webcontent.base.dir>
<site.basedir>${project.parent.basedir}</site.basedir>
@@ -76,7 +75,7 @@
<artifactId>maven-antrun-plugin</artifactId>
<executions>
<execution>
- <phase>package</phase>
+ <phase>compile</phase>
<configuration>
<exportAntProperties>true</exportAntProperties>
<target>
Modified: openmeetings/application/trunk/openmeetings-server/pom.xml
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-server/pom.xml?rev=1721292&r1=1721291&r2=1721292&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-server/pom.xml (original)
+++ openmeetings/application/trunk/openmeetings-server/pom.xml Tue Dec 22
02:23:19 2015
@@ -121,6 +121,7 @@
<maven.test.skip>true</maven.test.skip>
<assembly.finalName>server</assembly.finalName>
<assembly.descriptor>unpacked</assembly.descriptor>
+ <src.pack.skip>true</src.pack.skip>
</properties>
</profile>
<profile>
@@ -212,18 +213,34 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
- <configuration>
- <descriptors>
-
<descriptor>${project.basedir}/src/main/assembly/${assembly.descriptor}.xml</descriptor>
- </descriptors>
-
<finalName>${assembly.finalName}</finalName>
-
<appendAssemblyId>false</appendAssemblyId>
- <tarLongFileMode>gnu</tarLongFileMode>
- </configuration>
<executions>
<execution>
<id>make-assembly</id>
<phase>package</phase>
+ <configuration>
+ <descriptors>
+
<descriptor>${project.basedir}/src/main/assembly/${assembly.descriptor}.xml</descriptor>
+ </descriptors>
+
<finalName>${assembly.finalName}</finalName>
+
<appendAssemblyId>false</appendAssemblyId>
+
<tarLongFileMode>gnu</tarLongFileMode>
+ </configuration>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>make-src</id>
+ <phase>package</phase>
+ <configuration>
+ <descriptors>
+
<descriptor>${project.basedir}/src/main/assembly/src.xml</descriptor>
+ </descriptors>
+
<finalName>${project.build.finalName}</finalName>
+
<appendAssemblyId>true</appendAssemblyId>
+
<tarLongFileMode>gnu</tarLongFileMode>
+
<skipAssembly>${src.pack.skip}</skipAssembly>
+ </configuration>
<goals>
<goal>single</goal>
</goals>
Added:
openmeetings/application/trunk/openmeetings-server/src/main/assembly/src.xml
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-server/src/main/assembly/src.xml?rev=1721292&view=auto
==============================================================================
---
openmeetings/application/trunk/openmeetings-server/src/main/assembly/src.xml
(added)
+++
openmeetings/application/trunk/openmeetings-server/src/main/assembly/src.xml
Tue Dec 22 02:23:19 2015
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<assembly
+
xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2
http://maven.apache.org/xsd/assembly-1.1.2.xsd">
+ <id>src</id>
+ <formats>
+ <format>tar.gz</format>
+ <format>zip</format>
+ </formats>
+ <includeBaseDirectory>false</includeBaseDirectory>
+ <fileSets>
+ <fileSet>
+ <directory>${project.parent.basedir}</directory>
+ <outputDirectory></outputDirectory>
+ <useDefaultExcludes>true</useDefaultExcludes>
+ <includes>
+ <include>*.xml</include>
+ <include>CHANGELOG</include>
+ <include>LICENSE</include>
+ <include>NOTICE</include>
+ <include>README</include>
+ <include>openmeetings-*/**</include>
+ </includes>
+ <excludes>
+ <exclude>**/openmeetings-*/target/**</exclude>
+
<exclude>openmeetings-flash/openlaszlo/**</exclude>
+
<exclude>openmeetings-server/red5-server/**</exclude>
+ <exclude>openmeetings-web/test-data/**</exclude>
+ <exclude>**/.classpath/**</exclude>
+ <exclude>**/.project/**</exclude>
+ <exclude>**/.settings/**</exclude>
+ </excludes>
+ </fileSet>
+ </fileSets>
+</assembly>
Modified: openmeetings/application/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/pom.xml?rev=1721292&r1=1721291&r2=1721292&view=diff
==============================================================================
--- openmeetings/application/trunk/pom.xml (original)
+++ openmeetings/application/trunk/pom.xml Tue Dec 22 02:23:19 2015
@@ -55,6 +55,7 @@
<jettison.version>1.3.5</jettison.version>
<site.basedir>${project.basedir}</site.basedir>
<skip.site.copy>true</skip.site.copy>
+ <src.pack.skip>false</src.pack.skip>
</properties>
<modules>
<module>openmeetings-util</module>
@@ -83,6 +84,7 @@
<old-backups.dwnd.skip>true</old-backups.dwnd.skip>
<red5-server.dwnd.skip>true</red5-server.dwnd.skip>
<wicket.mode>DEVELOPMENT</wicket.mode>
+ <src.pack.skip>true</src.pack.skip>
</properties>
</profile>
<profile>