You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by db...@apache.org on 2013/12/09 05:09:17 UTC
svn commit: r1549378 - in /tomee/tomee/trunk:
assembly/openejb-lite/dependency-reduced-pom.xml
container/mbean-annotation-api/ container/pom.xml deps/ pom.xml
Author: dblevins
Date: Mon Dec 9 04:09:16 2013
New Revision: 1549378
URL: http://svn.apache.org/r1549378
Log:
Yank deps module as shading in the same project where the dep is used causes problems in other maven plugins like maven-assembly-plugin
Added:
tomee/tomee/trunk/container/mbean-annotation-api/
- copied from r1549361, tomee/tomee/trunk/deps/mbean-annotation-api/
Removed:
tomee/tomee/trunk/deps/
Modified:
tomee/tomee/trunk/assembly/openejb-lite/dependency-reduced-pom.xml
tomee/tomee/trunk/container/pom.xml
tomee/tomee/trunk/pom.xml
Modified: tomee/tomee/trunk/assembly/openejb-lite/dependency-reduced-pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/assembly/openejb-lite/dependency-reduced-pom.xml?rev=1549378&r1=1549377&r2=1549378&view=diff
==============================================================================
--- tomee/tomee/trunk/assembly/openejb-lite/dependency-reduced-pom.xml (original)
+++ tomee/tomee/trunk/assembly/openejb-lite/dependency-reduced-pom.xml Mon Dec 9 04:09:16 2013
@@ -1,26 +1,9 @@
<?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.
--->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<artifactId>assembly</artifactId>
<groupId>org.apache.openejb</groupId>
- <version>4.6.0-SNAPSHOT</version>
+ <version>4.6.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>openejb-lite</artifactId>
Modified: tomee/tomee/trunk/container/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/pom.xml?rev=1549378&r1=1549377&r2=1549378&view=diff
==============================================================================
--- tomee/tomee/trunk/container/pom.xml (original)
+++ tomee/tomee/trunk/container/pom.xml Mon Dec 9 04:09:16 2013
@@ -27,6 +27,7 @@
<packaging>pom</packaging>
<name>OpenEJB :: Container</name>
<modules>
+ <module>mbean-annotation-api</module>
<module>openejb-api</module>
<module>openejb-core</module>
<module>openejb-loader</module>
Modified: tomee/tomee/trunk/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/pom.xml?rev=1549378&r1=1549377&r2=1549378&view=diff
==============================================================================
--- tomee/tomee/trunk/pom.xml (original)
+++ tomee/tomee/trunk/pom.xml Mon Dec 9 04:09:16 2013
@@ -143,7 +143,7 @@
<bval.version>0.5</bval.version>
<org.apache.activemq.version>5.9.0</org.apache.activemq.version>
- <quartz.version>2.2.0</quartz.version>
+ <quartz.version>2.2.0-SNAPSHOT</quartz.version>
<org.springframework.version>3.1.3.RELEASE</org.springframework.version>
<junit.version>4.11</junit.version>
<org.apache.axis2.version>1.4.1</org.apache.axis2.version>
@@ -346,7 +346,6 @@
<activeByDefault>true</activeByDefault>
</activation>
<modules>
- <module>deps</module>
<module>itests</module>
<module>maven</module>
<module>container</module>
@@ -362,7 +361,6 @@
<profile>
<id>quick</id>
<modules>
- <module>deps</module>
<module>maven</module>
<module>container</module>
<module>server</module>
@@ -375,7 +373,6 @@
<profile>
<id>openejb</id>
<modules>
- <module>deps</module>
<module>itests</module>
<module>container</module>
<module>server</module>
@@ -425,7 +422,6 @@
<profile>
<id>rat</id>
<modules>
- <module>deps</module>
<module>itests</module>
<module>maven</module>
<module>container</module>