You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openjpa.apache.org by dw...@apache.org on 2010/04/23 16:56:46 UTC
svn commit: r937319 - in /openjpa/devtools/trunk:
org.apache.openjpa.eclipse.site/pom.xml pom.xml
Author: dwoods
Date: Fri Apr 23 14:56:46 2010
New Revision: 937319
URL: http://svn.apache.org/viewvc?rev=937319&view=rev
Log:
upgrade to openjpa-1.2.2. upgrade parent pom to apache-7. upgrade various maven plugins to match the levels used for 2.0 and trunk builds.
Modified:
openjpa/devtools/trunk/org.apache.openjpa.eclipse.site/pom.xml
openjpa/devtools/trunk/pom.xml
Modified: openjpa/devtools/trunk/org.apache.openjpa.eclipse.site/pom.xml
URL: http://svn.apache.org/viewvc/openjpa/devtools/trunk/org.apache.openjpa.eclipse.site/pom.xml?rev=937319&r1=937318&r2=937319&view=diff
==============================================================================
--- openjpa/devtools/trunk/org.apache.openjpa.eclipse.site/pom.xml (original)
+++ openjpa/devtools/trunk/org.apache.openjpa.eclipse.site/pom.xml Fri Apr 23 14:56:46 2010
@@ -42,7 +42,7 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<configuration>
- <finalName>openjpa-eclipse-plugin-${version}</finalName>
+ <finalName>openjpa-eclipse-plugin-${project.version}</finalName>
<descriptors>
<descriptor>src/main/assembly/updatesite.xml</descriptor>
</descriptors>
Modified: openjpa/devtools/trunk/pom.xml
URL: http://svn.apache.org/viewvc/openjpa/devtools/trunk/pom.xml?rev=937319&r1=937318&r2=937319&view=diff
==============================================================================
--- openjpa/devtools/trunk/pom.xml (original)
+++ openjpa/devtools/trunk/pom.xml Fri Apr 23 14:56:46 2010
@@ -21,12 +21,13 @@
Maven release plugin requires the project tag to be on a single line.
-->
<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">
+
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache</groupId>
<artifactId>apache</artifactId>
- <version>6</version>
+ <version>7</version>
</parent>
<groupId>org.apache.openjpa.eclipse</groupId>
@@ -40,7 +41,7 @@
<properties>
<!-- <tycho-version>0.6.0-SNAPSHOT</tycho-version> -->
<tycho-version>0.5.0</tycho-version>
- <openjpa-version>1.2.1</openjpa-version>
+ <openjpa-version>1.2.2</openjpa-version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<checkstyle.config.location>../checkstyle.xml</checkstyle.config.location>
</properties>
@@ -109,6 +110,7 @@
<url>http://download.eclipse.org/eclipse/updates/3.5</url>
</repository>
</repositories>
+
<pluginRepositories>
<pluginRepository>
<id>sonatype-forge</id>
@@ -140,7 +142,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>2.0.2</version>
+ <version>2.1</version>
<configuration>
<source>1.5</source>
<target>1.5</target>
@@ -149,7 +151,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
- <version>2.2</version>
+ <version>2.3</version>
<configuration>
<archive>
<manifest>
@@ -189,22 +191,22 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
- <version>2.3</version>
+ <version>2.4.2</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
- <version>2.2-beta-3</version>
+ <version>2.2-beta-5</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId>
- <version>1.0-alpha-4</version>
+ <version>1.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
- <version>2.0-beta-7</version>
+ <version>2.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -252,6 +254,7 @@
</plugin>
</plugins>
</pluginManagement>
+
<plugins>
<plugin>
<groupId>org.codehaus.tycho</groupId>