Author: hasan
Date: Fri Feb 4 17:45:11 2011
New Revision: 1067239
URL: http://svn.apache.org/viewvc?rev=1067239&view=rev
Log:
added missing version in pom.xml, organized plugins with pluginManagement,
updated dependencyManagement
Modified:
incubator/clerezza/trunk/scala-scripting/pom.xml
incubator/clerezza/trunk/scala-scripting/scala-compiler-osgi/pom.xml
incubator/clerezza/trunk/scala-scripting/scala-library-osgi/pom.xml
incubator/clerezza/trunk/scala-scripting/script-engine/pom.xml
incubator/clerezza/trunk/scala-scripting/tests/pom.xml
Modified: incubator/clerezza/trunk/scala-scripting/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/clerezza/trunk/scala-scripting/pom.xml?rev=1067239&r1=1067238&r2=1067239&view=diff
==============================================================================
--- incubator/clerezza/trunk/scala-scripting/pom.xml (original)
+++ incubator/clerezza/trunk/scala-scripting/pom.xml Fri Feb 4 17:45:11 2011
@@ -2,12 +2,11 @@
<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";>
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.clerezza.scala</groupId>
- <version>0.1-incubating-SNAPSHOT</version>
<artifactId>scala</artifactId>
+ <version>0.1-incubating-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Scala OSGi Services</name>
- <description>Provides bundles and services to allow compiling abd
executing
- scala code
+ <description>Provides bundles and services to allow compiling and
executing scala code
</description>
<modules>
<module>scala-library-osgi</module>
@@ -28,6 +27,21 @@
<version>2.8.1</version>
</dependency>
<dependency>
+ <groupId>org.apache.felix</groupId>
+
<artifactId>org.apache.felix.scr.annotations</artifactId>
+ <version>1.4.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.compendium</artifactId>
+ <version>4.2.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.core</artifactId>
+ <version>4.2.0</version>
+ </dependency>
+ <dependency>
<groupId>org.apache.clerezza.scala</groupId>
<artifactId>scala-library-osgi</artifactId>
<version>0.1-incubating-SNAPSHOT</version>
@@ -60,11 +74,40 @@
<build>
<sourceDirectory>src/main/scala</sourceDirectory>
<testSourceDirectory>src/test/scala</testSourceDirectory>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.scala-tools</groupId>
+
<artifactId>maven-scala-plugin</artifactId>
+ <version>2.15.0</version>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+
<artifactId>build-helper-maven-plugin</artifactId>
+ <version>1.5</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+
<artifactId>maven-bundle-plugin</artifactId>
+ <extensions>true</extensions>
+ <version>2.2.0</version>
+ </plugin>
+ <plugin>
+
<groupId>org.apache.maven.plugins</groupId>
+
<artifactId>maven-eclipse-plugin</artifactId>
+ <version>2.8</version>
+ </plugin>
+ <plugin>
+
<groupId>org.apache.maven.plugins</groupId>
+
<artifactId>maven-source-plugin</artifactId>
+ <version>2.1.2</version>
+ </plugin>
+ </plugins>
+ </pluginManagement>
<plugins>
<plugin>
<groupId>org.scala-tools</groupId>
<artifactId>maven-scala-plugin</artifactId>
- <version>2.13.1</version>
<executions>
<execution>
<goals>
@@ -74,43 +117,41 @@
</execution>
</executions>
<configuration>
-
<args>
<arg>-deprecation</arg>
</args>
</configuration>
</plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>build-helper-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>add-source</id>
- <phase>generate-sources</phase>
- <goals>
- <goal>add-source</goal>
- </goals>
- <configuration>
- <sources>
-
<source>src/main/scala</source>
- </sources>
- </configuration>
- </execution>
- <execution>
- <id>add-test-source</id>
- <phase>generate-sources</phase>
- <goals>
- <goal>add-test-source</goal>
- </goals>
- <configuration>
- <sources>
-
<source>src/test/scala</source>
- </sources>
- </configuration>
- </execution>
-
- </executions>
- </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+
<artifactId>build-helper-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>add-source</id>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>add-source</goal>
+ </goals>
+ <configuration>
+ <sources>
+
<source>src/main/scala</source>
+ </sources>
+ </configuration>
+ </execution>
+ <execution>
+ <id>add-test-source</id>
+ <phase>generate-sources</phase>
+ <goals>
+
<goal>add-test-source</goal>
+ </goals>
+ <configuration>
+ <sources>
+
<source>src/test/scala</source>
+ </sources>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
</project>
Modified: incubator/clerezza/trunk/scala-scripting/scala-compiler-osgi/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/clerezza/trunk/scala-scripting/scala-compiler-osgi/pom.xml?rev=1067239&r1=1067238&r2=1067239&view=diff
==============================================================================
--- incubator/clerezza/trunk/scala-scripting/scala-compiler-osgi/pom.xml
(original)
+++ incubator/clerezza/trunk/scala-scripting/scala-compiler-osgi/pom.xml Fri
Feb 4 17:45:11 2011
@@ -1,46 +1,41 @@
-
-<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";>
-
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";>
+ <modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.clerezza.scala</groupId>
<artifactId>scala</artifactId>
<version>0.1-incubating-SNAPSHOT</version>
</parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>scala-compiler-osgi</artifactId>
- <packaging>bundle</packaging>
- <name>Scala OSGi Services - Compiler Bundle</name>
-
- <dependencies>
- <dependency>
- <groupId>org.scala-lang</groupId>
- <artifactId>scala-compiler</artifactId>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.scala-tools</groupId>
- <artifactId>maven-scala-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <extensions>true</extensions>
- <version>2.1.0</version>
- <configuration>
- <instructions>
+ <artifactId>scala-compiler-osgi</artifactId>
+ <packaging>bundle</packaging>
+ <name>Scala OSGi Services - Compiler Bundle</name>
+ <dependencies>
+ <dependency>
+ <groupId>org.scala-lang</groupId>
+ <artifactId>scala-compiler</artifactId>
+ </dependency>
+ </dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.scala-tools</groupId>
+ <artifactId>maven-scala-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <configuration>
+ <instructions>
<Embed-Dependency>*</Embed-Dependency>
<Embed-Transitive>true</Embed-Transitive>
- <Export-Package>scala.*</Export-Package>
+
<Export-Package>scala.*</Export-Package>
<Import-Package>!sun.*,
-
!org.apache.tools.ant,!jline</Import-Package>
- <DynamicImport-Package>*</DynamicImport-Package>
- </instructions>
- </configuration>
- </plugin>
- </plugins>
- </build>
+ !org.apache.tools.ant,!jline
+ </Import-Package>
+
<DynamicImport-Package>*</DynamicImport-Package>
+ </instructions>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</project>
Modified: incubator/clerezza/trunk/scala-scripting/scala-library-osgi/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/clerezza/trunk/scala-scripting/scala-library-osgi/pom.xml?rev=1067239&r1=1067238&r2=1067239&view=diff
==============================================================================
--- incubator/clerezza/trunk/scala-scripting/scala-library-osgi/pom.xml
(original)
+++ incubator/clerezza/trunk/scala-scripting/scala-library-osgi/pom.xml Fri Feb
4 17:45:11 2011
@@ -1,13 +1,11 @@
-
-<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";>
-
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";>
+ <modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.clerezza.scala</groupId>
<artifactId>scala</artifactId>
<version>0.1-incubating-SNAPSHOT</version>
</parent>
- <modelVersion>4.0.0</modelVersion>
<artifactId>scala-library-osgi</artifactId>
<packaging>bundle</packaging>
<name>Scala OSGi Services - Library Bundle</name>
@@ -17,14 +15,11 @@
<artifactId>scala-library</artifactId>
</dependency>
</dependencies>
-
<build>
<plugins>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <extensions>true</extensions>
- <version>2.1.0</version>
<configuration>
<instructions>
<Embed-Dependency>*</Embed-Dependency>
Modified: incubator/clerezza/trunk/scala-scripting/script-engine/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/clerezza/trunk/scala-scripting/script-engine/pom.xml?rev=1067239&r1=1067238&r2=1067239&view=diff
==============================================================================
--- incubator/clerezza/trunk/scala-scripting/script-engine/pom.xml (original)
+++ incubator/clerezza/trunk/scala-scripting/script-engine/pom.xml Fri Feb 4
17:45:11 2011
@@ -1,4 +1,5 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><project
xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";>
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.clerezza.scala</groupId>
@@ -20,17 +21,14 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.scr.annotations</artifactId>
- <version>1.3.0</version>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.compendium</artifactId>
- <version>4.1.0</version>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
- <version>4.1.0</version>
</dependency>
</dependencies>
<build>
@@ -38,8 +36,6 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <extensions>true</extensions>
- <version>2.1.0</version>
<configuration>
<instructions>
<Service-Component>OSGI-INF/serviceComponents.xml</Service-Component>
@@ -72,5 +68,3 @@
</plugins>
</build>
</project>
-
-
Modified: incubator/clerezza/trunk/scala-scripting/tests/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/clerezza/trunk/scala-scripting/tests/pom.xml?rev=1067239&r1=1067238&r2=1067239&view=diff
==============================================================================
--- incubator/clerezza/trunk/scala-scripting/tests/pom.xml (original)
+++ incubator/clerezza/trunk/scala-scripting/tests/pom.xml Fri Feb 4 17:45:11
2011
@@ -1,29 +1,27 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<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";>
+<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";>
+ <modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.clerezza.scala</groupId>
<artifactId>scala</artifactId>
<version>0.1-incubating-SNAPSHOT</version>
</parent>
- <modelVersion>4.0.0</modelVersion>
<groupId>org.apache.clerezza.scala</groupId>
<artifactId>tests</artifactId>
<packaging>jar</packaging>
<name>Scala OSGi Services - Tests</name>
<description>Tests for Scala OSGi Services.</description>
<dependencies>
-
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.compendium</artifactId>
<scope>provided</scope>
- <version>4.2.0</version>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
- <version>4.8.1</version>
+ <version>4.8.2</version>
</dependency>
<!-- pax exam related stuff -->
