You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by rf...@apache.org on 2008/03/28 21:57:16 UTC
svn commit: r642379 - in /incubator/tuscany/branches/sdo-1.1-incubating:
impl/ impl/src/main/resources/META-INF/MANIFEST.MF java5tools/ lib/pom.xml
lib/src/main/resources/META-INF/MANIFEST.MF pom.xml sdo-api/pom.xml
Author: rfeng
Date: Fri Mar 28 13:57:15 2008
New Revision: 642379
URL: http://svn.apache.org/viewvc?rev=642379&view=rev
Log:
Fix the pom.xml to avoid build break with JDK 1.4. The issue was reported by sebb on the review of the RC3
Modified:
incubator/tuscany/branches/sdo-1.1-incubating/impl/ (props changed)
incubator/tuscany/branches/sdo-1.1-incubating/impl/src/main/resources/META-INF/MANIFEST.MF
incubator/tuscany/branches/sdo-1.1-incubating/java5tools/ (props changed)
incubator/tuscany/branches/sdo-1.1-incubating/lib/pom.xml
incubator/tuscany/branches/sdo-1.1-incubating/lib/src/main/resources/META-INF/MANIFEST.MF
incubator/tuscany/branches/sdo-1.1-incubating/pom.xml
incubator/tuscany/branches/sdo-1.1-incubating/sdo-api/pom.xml
Propchange: incubator/tuscany/branches/sdo-1.1-incubating/impl/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Fri Mar 28 13:57:15 2008
@@ -10,4 +10,5 @@
.settings
.deployables
.wtpmodules
+.felix
Modified: incubator/tuscany/branches/sdo-1.1-incubating/impl/src/main/resources/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sdo-1.1-incubating/impl/src/main/resources/META-INF/MANIFEST.MF?rev=642379&r1=642378&r2=642379&view=diff
==============================================================================
--- incubator/tuscany/branches/sdo-1.1-incubating/impl/src/main/resources/META-INF/MANIFEST.MF (original)
+++ incubator/tuscany/branches/sdo-1.1-incubating/impl/src/main/resources/META-INF/MANIFEST.MF Fri Mar 28 13:57:15 2008
@@ -5,7 +5,7 @@
Implementation-Vendor: Apache Software Foundation
Implementation-Vendor-Id: org.apache
Implementation-Title: tuscany-sdo-impl
-Implementation-Version: incubating-M3
+Implementation-Version: ${pom.version}
Bundle-ManifestVersion: 2
Bundle-Name: Tuscany SDO Implementation
Bundle-SymbolicName: org.apache.tuscany.sdo.impl
Propchange: incubator/tuscany/branches/sdo-1.1-incubating/java5tools/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Mar 28 13:57:15 2008
@@ -0,0 +1,14 @@
+target
+*.iws
+*.ipr
+*.iml
+.project
+.classpath
+maven.log
+velocity.log*
+junit*.properties
+surefire*.properties
+.settings
+.deployables
+.wtpmodules
+
Modified: incubator/tuscany/branches/sdo-1.1-incubating/lib/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sdo-1.1-incubating/lib/pom.xml?rev=642379&r1=642378&r2=642379&view=diff
==============================================================================
--- incubator/tuscany/branches/sdo-1.1-incubating/lib/pom.xml (original)
+++ incubator/tuscany/branches/sdo-1.1-incubating/lib/pom.xml Fri Mar 28 13:57:15 2008
@@ -69,7 +69,7 @@
<artifactId>maven-jar-plugin</artifactId>
<configuration>
<archive>
- <manifestFile>src/main/resources/META-INF/MANIFEST.MF</manifestFile>
+ <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
</archive>
</configuration>
</plugin>
Modified: incubator/tuscany/branches/sdo-1.1-incubating/lib/src/main/resources/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sdo-1.1-incubating/lib/src/main/resources/META-INF/MANIFEST.MF?rev=642379&r1=642378&r2=642379&view=diff
==============================================================================
--- incubator/tuscany/branches/sdo-1.1-incubating/lib/src/main/resources/META-INF/MANIFEST.MF (original)
+++ incubator/tuscany/branches/sdo-1.1-incubating/lib/src/main/resources/META-INF/MANIFEST.MF Fri Mar 28 13:57:15 2008
@@ -5,7 +5,7 @@
Implementation-Vendor: Apache Software Foundation
Implementation-Vendor-Id: org.apache
Implementation-Title: tuscany-sdo-lib
-Implementation-Version: 1.1-incubating
+Implementation-Version: ${pom.version}
Bundle-ManifestVersion: 2
Bundle-Name: Tuscany SDO Implementation Library
Bundle-SymbolicName: org.apache.tuscany.sdo.lib
Modified: incubator/tuscany/branches/sdo-1.1-incubating/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sdo-1.1-incubating/pom.xml?rev=642379&r1=642378&r2=642379&view=diff
==============================================================================
--- incubator/tuscany/branches/sdo-1.1-incubating/pom.xml (original)
+++ incubator/tuscany/branches/sdo-1.1-incubating/pom.xml Fri Mar 28 13:57:15 2008
@@ -1,21 +1,21 @@
<?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.
+ * 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>
<modelVersion>4.0.0</modelVersion>
@@ -29,7 +29,7 @@
<packaging>pom</packaging>
<name>Apache Tuscany SDO Implementation Project</name>
<version>1.1-incubating</version>
-
+
<scm>
<connection>scm:svn:http://svn.apache.org/repos/asf/incubator/tuscany/java/sdo</connection>
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/incubator/tuscany/java/sdo</developerConnection>
@@ -61,9 +61,9 @@
</repository>
<repository>
<!-- <id>eclipse.emf</id>
- <url>http://download.eclipse.org/tools/emf/maven2</url> -->
+ <url>http://download.eclipse.org/tools/emf/maven2</url> -->
<!-- <id>osuosl.org</id>
- <url>http://ftp.osuosl.org/pub/eclipse/tools/emf/maven2</url> -->
+ <url>http://ftp.osuosl.org/pub/eclipse/tools/emf/maven2</url> -->
<!-- temporarily using indiana state univ as eclipse site diesnt have 2.2.2 at the moment -->
<id>indiana</id>
<url>http://ftp.ussg.iu.edu/eclipse/modeling/emf/emf/maven2/</url>
@@ -122,9 +122,13 @@
<module>java5tools</module>
</modules>
</profile>
-
- <profile>
+
+ <profile>
<id>java_1_4_maven</id>
+ <activation>
+ <jdk>1.4</jdk>
+ </activation>
+
<modules>
<module>sdo-api</module>
<module>lib</module>
@@ -134,12 +138,19 @@
<module>sample</module>
<module>distribution</module>
</modules>
- </profile>
+ </profile>
</profiles>
<build>
<defaultGoal>install</defaultGoal>
+ <resources>
+ <resource>
+ <directory>src/main/resources</directory>
+ <filtering>true</filtering>
+ </resource>
+ </resources>
+
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -154,17 +165,18 @@
<version>2.3</version>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
+ <argLine>-Djava.endorsed.dirs=${java.endorsed.dirs}</argLine>
<includes>
<include>**/*TestCase.java</include>
</includes>
</configuration>
</plugin>
-
-
+
+
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
- <version>2.2-SNAPSHOT</version>
+ <version>2.2-beta-2</version>
<configuration>
<descriptors>
<descriptor>sdo.xml</descriptor>
@@ -175,16 +187,16 @@
<pluginManagement>
<plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <version>2.2</version>
- <configuration>
- <aggregate>true</aggregate>
- <version>2.0</version>
- <source>1.4</source>
- </configuration>
- </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>2.2</version>
+ <configuration>
+ <aggregate>true</aggregate>
+ <version>2.0</version>
+ <source>1.4</source>
+ </configuration>
+ </plugin>
</plugins>
</pluginManagement>
Modified: incubator/tuscany/branches/sdo-1.1-incubating/sdo-api/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sdo-1.1-incubating/sdo-api/pom.xml?rev=642379&r1=642378&r2=642379&view=diff
==============================================================================
--- incubator/tuscany/branches/sdo-1.1-incubating/sdo-api/pom.xml (original)
+++ incubator/tuscany/branches/sdo-1.1-incubating/sdo-api/pom.xml Fri Mar 28 13:57:15 2008
@@ -26,7 +26,7 @@
</parent>
<groupId>org.apache.tuscany.sdo</groupId>
<artifactId>tuscany-sdo-api-r${specVersion}</artifactId>
- <packaging>bundle</packaging>
+ <packaging>jar</packaging>
<version>1.1-incubating</version>
<name>SDO API</name>
<description>API classes for Service Data Objects</description>
@@ -97,23 +97,27 @@
</plugin>
<plugin>
- <artifactId>maven-jar-plugin</artifactId>
- <configuration>
- <archive>
- <manifestEntries>
- <Implementation-Vendor-Id>org.apache</Implementation-Vendor-Id>
- <Implementation-Version>1.1-incubating</Implementation-Version>
- <X-Compile-Source-JDK>1.4</X-Compile-Source-JDK>
- <X-Compile-Target-JDK>1.4</X-Compile-Target-JDK>
- </manifestEntries>
- </archive>
- </configuration>
+ <artifactId>maven-jar-plugin</artifactId>
+ <configuration>
+ <archive>
+ <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
+ </archive>
+ </configuration>
</plugin>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>1.2.1</version>
+ <version>1.4.0</version>
<extensions>true</extensions>
+ <executions>
+ <execution>
+ <id>bundle-manifest</id>
+ <phase>process-classes</phase>
+ <goals>
+ <goal>manifest</goal>
+ </goals>
+ </execution>
+ </executions>
<configuration>
<instructions>
<Bundle-Name>${pom.name}</Bundle-Name>
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org