Author: jlmonteiro
Date: Fri May 21 15:31:02 2010
New Revision: 947040
URL: http://svn.apache.org/viewvc?rev=947040&view=rev
Log:
Update Compiler plugin to the latest available version.
Assuming compiler version is manage for the whole project, remove compiler
definition of sub project.
Modified:
openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-bundle/pom.xml
openejb/trunk/openejb3/container/openejb-javaagent/pom.xml
openejb/trunk/openejb3/container/openejb-junit/pom.xml
Modified:
openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-bundle/pom.xml
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-bundle/pom.xml?rev=947040&r1=947039&r2=947040&view=diff
==============================================================================
---
openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-bundle/pom.xml
(original)
+++
openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-bundle/pom.xml
Fri May 21 15:31:02 2010
@@ -37,12 +37,12 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-loader</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-tomcat-common</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.tomcat</groupId>
@@ -53,15 +53,6 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>2.3</version>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<executions>
<execution>
@@ -72,7 +63,7 @@
<property name="OUTPUT_DIR"
value="${basedir}/target"/>
<property name="LOCAL_M2_REPO"
value="${settings.localRepository}"/>
<property name="tomcat.version"
value="${tomcat.version}"/>
- <property name="openejb.version"
value="${version}"/>
+ <property name="openejb.version"
value="${project.version}"/>
<ant antfile="${basedir}/build.xml">
<target name="downloadtomcat"/>
@@ -128,7 +119,7 @@
<id>war</id>
<phase>package</phase>
<configuration>
-
<finalName>${artifactId}-${tomcat.version}-${version}</finalName>
+
<finalName>${project.artifactId}-${tomcat.version}-${project.version}</finalName>
</configuration>
<goals>
<goal>attached</goal>
Modified: openejb/trunk/openejb3/container/openejb-javaagent/pom.xml
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-javaagent/pom.xml?rev=947040&r1=947039&r2=947040&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-javaagent/pom.xml (original)
+++ openejb/trunk/openejb3/container/openejb-javaagent/pom.xml Fri May 21
15:31:02 2010
@@ -42,13 +42,6 @@
</configuration>
</plugin>
<plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
- <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
Modified: openejb/trunk/openejb3/container/openejb-junit/pom.xml
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-junit/pom.xml?rev=947040&r1=947039&r2=947040&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-junit/pom.xml (original)
+++ openejb/trunk/openejb3/container/openejb-junit/pom.xml Fri May 21 15:31:02
2010
@@ -1,44 +1,46 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";
- xmlns="http://maven.apache.org/POM/4.0.0";
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";>
+<!--
- <parent>
- <artifactId>container</artifactId>
- <groupId>org.apache.openejb</groupId>
- <version>3.2-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>openejb-junit</artifactId>
- <packaging>jar</packaging>
- <name>OpenEJB :: Container :: JUnit</name>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>2.0.2</version>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
- </plugins>
- </build>
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.openejb</groupId>
- <artifactId>openejb-core</artifactId>
- <version>${version}</version>
- </dependency>
- </dependencies>
- <properties>
- <netbeans.hint.license>openejb</netbeans.hint.license>
- </properties>
+ 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>container</artifactId>
+ <groupId>org.apache.openejb</groupId>
+ <version>3.2-SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>openejb-junit</artifactId>
+ <packaging>jar</packaging>
+ <name>OpenEJB :: Container :: JUnit</name>
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.openejb</groupId>
+ <artifactId>openejb-core</artifactId>
+ <version>${version}</version>
+ </dependency>
+ </dependencies>
+ <properties>
+ <netbeans.hint.license>openejb</netbeans.hint.license>
+ </properties>
</project>
