Remove assembly from main project.
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@910092 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/main/assembly.xml b/main/assembly.xml
deleted file mode 100644
index 73a261a..0000000
--- a/main/assembly.xml
+++ /dev/null
@@ -1,69 +0,0 @@
-<!--
- 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>
- <id>distribution</id>
- <formats>
- <format>zip</format>
- <format>tar.gz</format>
- </formats>
- <fileSets>
- <fileSet>
- <directory>${project.basedir}/bin</directory>
- <outputDirectory>bin</outputDirectory>
- <useDefaultExcludes>true</useDefaultExcludes>
- <includes>
- <include>*.jar</include>
- </includes>
- </fileSet>
- <fileSet>
- <directory>${project.basedir}/bundle</directory>
- <outputDirectory>bundle</outputDirectory>
- <useDefaultExcludes>true</useDefaultExcludes>
- <includes>
- <include>*.jar</include>
- </includes>
- </fileSet>
- <fileSet>
- <directory>${project.basedir}/conf</directory>
- <outputDirectory>conf</outputDirectory>
- <useDefaultExcludes>true</useDefaultExcludes>
- <includes>
- <include>*.properties</include>
- </includes>
- </fileSet>
- <fileSet>
- <directory>${project.basedir}/doc</directory>
- <outputDirectory>doc</outputDirectory>
- <useDefaultExcludes>true</useDefaultExcludes>
- <includes>
- <include>**</include>
- </includes>
- </fileSet>
- <fileSet>
- <directory>${project.basedir}</directory>
- <includes>
- <include>README*</include>
- <include>LICENSE*</include>
- <include>NOTICE*</include>
- </includes>
- <outputDirectory>.</outputDirectory>
- <useDefaultExcludes>true</useDefaultExcludes>
- </fileSet>
- </fileSets>
-</assembly>
diff --git a/main/pom.xml b/main/pom.xml
index b929a5c..eeb977c 100644
--- a/main/pom.xml
+++ b/main/pom.xml
@@ -109,10 +109,10 @@
<properties>
<log.level>4</log.level>
<dollar>$</dollar>
- <framework.version>2.1.0-SNAPSHOT</framework.version>
- <shell.version>1.5.0-SNAPSHOT</shell.version>
+ <framework.version>2.0.3</framework.version>
+ <shell.version>1.4.2</shell.version>
<shell.tui.version>1.4.1</shell.tui.version>
- <obr.version>1.5.0-SNAPSHOT</obr.version>
+ <obr.version>1.4.3</obr.version>
</properties>
<profiles>
<profile>
@@ -240,25 +240,6 @@
</execution>
</executions>
</plugin>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <executions>
- <execution>
- <id>assemble</id>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- <configuration>
- <descriptors>
- <descriptor>assembly.xml</descriptor>
- </descriptors>
- <appendAssemblyId>false</appendAssemblyId>
- <finalName>felix-framework-${framework.version}</finalName>
- </configuration>
- </execution>
- </executions>
- </plugin>
</plugins>
<resources>
<resource>
@@ -268,9 +249,4 @@
</resources>
</build>
- <scm>
- <connection>scm:svn:https://svn.apache.org/repos/asf/felix/releases/org.apache.felix.main-2.0.3</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/felix/releases/org.apache.felix.main-2.0.3</developerConnection>
- <url>scm:svn:https://svn.apache.org/repos/asf/felix/releases/org.apache.felix.main-2.0.3</url>
- </scm>
</project>