perfsonar-dev - [pS-dev] [GEANT/SA2/ps-java-services] r6370 - in trunk: parent perfsonar-base/apt perfsonar-base/base perfsonar-base/ls perfsonar-base/messaging perfsonar-base/sample-service
Subject: perfsonar development work
List archive
[pS-dev] [GEANT/SA2/ps-java-services] r6370 - in trunk: parent perfsonar-base/apt perfsonar-base/base perfsonar-base/ls perfsonar-base/messaging perfsonar-base/sample-service
Chronological Thread
- From:
- To:
- Subject: [pS-dev] [GEANT/SA2/ps-java-services] r6370 - in trunk: parent perfsonar-base/apt perfsonar-base/base perfsonar-base/ls perfsonar-base/messaging perfsonar-base/sample-service
- Date: Tue, 7 May 2013 15:18:22 +0100 (BST)
- Authentication-results: sfpop-ironport05.merit.edu; dkim=neutral (message not signed) header.i=none
Author: dante.delvaux
Date: 2013-05-07 15:18:22 +0100 (Tue, 07 May 2013)
New Revision: 6370
Modified:
trunk/parent/pom.xml
trunk/perfsonar-base/apt/pom.xml
trunk/perfsonar-base/base/pom.xml
trunk/perfsonar-base/ls/pom.xml
trunk/perfsonar-base/messaging/pom.xml
trunk/perfsonar-base/sample-service/pom.xml
Log:
pSbase3: moving maven-bundle-plugin to the parent POM and trying to get rid
of useless warning when building the bundle.
Modified: trunk/parent/pom.xml
===================================================================
--- trunk/parent/pom.xml 2013-05-06 19:43:27 UTC (rev 6369)
+++ trunk/parent/pom.xml 2013-05-07 14:18:22 UTC (rev 6370)
@@ -115,7 +115,7 @@
<name>GEANT repository</name>
<!-- Our main repository, merge of perfsonar repos and mirrors
-->
<url>https://artifactory.geant.net/artifactory/repo/</url>
-
<releases><enabled>true</enabled><updatePolicy>always</updatePolicy></releases>
+
<releases><enabled>true</enabled><updatePolicy>interval:60</updatePolicy></releases>
<snapshots><enabled>true</enabled><updatePolicy>always</updatePolicy></snapshots>
</repository>
@@ -138,7 +138,7 @@
<build>
<plugins>
- <!-- Release management plugins, needed by submodules, see
RELEASES.txt -->
+ <!-- Release management plugins, needed by all submodules, see
RELEASES.txt -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
@@ -198,6 +198,7 @@
<artifactId>maven-clean-plugin</artifactId>
<version>2.5</version>
</plugin>
+
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-install-plugin</artifactId>
@@ -236,8 +237,15 @@
<artifactId>maven-bundle-plugin</artifactId>
<version>2.3.7</version>
<extensions>true</extensions>
+ <configuration>
+ <instructions>
+ <!-- TODO: we need to check if it is merge-first
we really want, or if we want OSGI bundles at all -->
+ <!-- This is currently only used in pSbase3 -->
+
<Export-Package>net.geant.perfsonar.*;-split-package:=merge-first</Export-Package>
+ </instructions>
+ </configuration>
</plugin>
-
+
<plugin>
<groupId>org.vafer</groupId>
<artifactId>jdeb</artifactId>
@@ -309,6 +317,7 @@
</plugin>
<!-- QA and reporting plugins -->
+ <!-- TODO: Most of these plugins should be moved to the
build section to be active in all submodules -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
Modified: trunk/perfsonar-base/apt/pom.xml
===================================================================
--- trunk/perfsonar-base/apt/pom.xml 2013-05-06 19:43:27 UTC (rev 6369)
+++ trunk/perfsonar-base/apt/pom.xml 2013-05-07 14:18:22 UTC (rev 6370)
@@ -4,7 +4,7 @@
<parent>
<groupId>net.geant.perfsonar</groupId>
<artifactId>parent</artifactId>
- <version>1.0.2</version>
+ <version>1.0.3-SNAPSHOT</version>
<relativePath>../../parent/</relativePath>
</parent>
Modified: trunk/perfsonar-base/base/pom.xml
===================================================================
--- trunk/perfsonar-base/base/pom.xml 2013-05-06 19:43:27 UTC (rev 6369)
+++ trunk/perfsonar-base/base/pom.xml 2013-05-07 14:18:22 UTC (rev 6370)
@@ -5,7 +5,7 @@
<parent>
<groupId>net.geant.perfsonar</groupId>
<artifactId>parent</artifactId>
- <version>1.0.2</version>
+ <version>1.0.3-SNAPSHOT</version>
<relativePath>../../parent/</relativePath>
</parent>
@@ -22,6 +22,34 @@
<url>https://svn.geant.net/fisheye/browse/SA2T3-ps-java-services/trunk/perfsonar-base/base/</url>
</scm>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <proc>none</proc>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>attach-tests-artifact</id>
+ <goals>
+ <goal>test-jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
<dependencies>
<dependency>
<groupId>net.geant.perfsonar.base</groupId>
@@ -76,40 +104,4 @@
</dependency>
</dependencies>
- <build>
- <pluginManagement>
- <plugins>
- <plugin>
-
<groupId>org.apache.maven.plugins</groupId>
-
<artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <proc>none</proc>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <configuration>
- <instructions>
-
<Export-Package>net.geant.perfsonar.*</Export-Package>
- </instructions>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <executions>
- <execution>
- <id>attach-tests-artifact</id>
- <goals>
- <goal>test-jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
</project>
Modified: trunk/perfsonar-base/ls/pom.xml
===================================================================
--- trunk/perfsonar-base/ls/pom.xml 2013-05-06 19:43:27 UTC (rev 6369)
+++ trunk/perfsonar-base/ls/pom.xml 2013-05-07 14:18:22 UTC (rev 6370)
@@ -5,7 +5,7 @@
<parent>
<groupId>net.geant.perfsonar</groupId>
<artifactId>parent</artifactId>
- <version>1.0.2</version>
+ <version>1.0.3-SNAPSHOT</version>
<relativePath>../../parent/</relativePath>
</parent>
@@ -22,20 +22,26 @@
<url>https://svn.geant.net/fisheye/browse/SA2T3-ps-java-services/trunk/perfsonar-base/ls/</url>
</scm>
- <developers>
- <developer>
- <id>blazej.pietrzak</id>
- <name>Blazej Pietrzak</name>
-
<email></email>
- <organization>PSNC</organization>
-
<organizationUrl>http://www.man.poznan.pl/</organizationUrl>
- <roles>
- <role>architect</role>
- <role>developer</role>
- </roles>
- <timezone>+1</timezone>
- </developer>
- </developers>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>attach-tests-artifact</id>
+ <goals>
+ <goal>test-jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
<dependencies>
<dependency>
@@ -84,29 +90,4 @@
</dependency>
</dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <configuration>
- <instructions>
-
<Export-Package>net.geant.perfsonar.*</Export-Package>
- </instructions>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <executions>
- <execution>
- <id>attach-tests-artifact</id>
- <goals>
- <goal>test-jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
</project>
Modified: trunk/perfsonar-base/messaging/pom.xml
===================================================================
--- trunk/perfsonar-base/messaging/pom.xml 2013-05-06 19:43:27 UTC (rev
6369)
+++ trunk/perfsonar-base/messaging/pom.xml 2013-05-07 14:18:22 UTC (rev
6370)
@@ -5,7 +5,7 @@
<parent>
<groupId>net.geant.perfsonar</groupId>
<artifactId>parent</artifactId>
- <version>1.0.2</version>
+ <version>1.0.3-SNAPSHOT</version>
<relativePath>../../parent/</relativePath>
</parent>
@@ -22,20 +22,43 @@
<url>https://svn.geant.net/fisheye/browse/SA2T3-ps-java-services/trunk/perfsonar-base/messaging/</url>
</scm>
- <developers>
- <developer>
- <id>blazej.pietrzak</id>
- <name>Blazej Pietrzak</name>
-
<email></email>
- <organization>PSNC</organization>
-
<organizationUrl>http://www.man.poznan.pl/</organizationUrl>
- <roles>
- <role>architect</role>
- <role>developer</role>
- </roles>
- <timezone>+1</timezone>
- </developer>
- </developers>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>2.3.2</version><!--$NO-MVN-MAN-VER$--> <!-- Groovy
Eclipse Compiler does not work with 3.0 -->
+ <!-- This also means that one has to install the
Groovy-Eclipse configurator for m2Eclipse -->
+ <!-- See
http://groovy.codehaus.org/Groovy-Eclipse+compiler+plugin+for+Maven#Groovy-EclipsecompilerpluginforMaven-Groovy-Eclipseconfiguratorform2Eclipse
-->
+ <configuration>
+ <compilerId>groovy-eclipse-compiler</compilerId>
+ <verbose>false</verbose>
+ </configuration>
+ <dependencies>
+ <dependency>
+ <groupId>org.codehaus.groovy</groupId>
+ <artifactId>groovy-eclipse-compiler</artifactId>
+ <version>2.7.0-01</version>
+ </dependency>
+ </dependencies>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>attach-tests-artifact</id>
+ <goals>
+ <goal>test-jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
<dependencies>
<dependency>
@@ -80,7 +103,6 @@
<dependency>
<groupId>org.codehaus.groovy</groupId>
<artifactId>groovy-all</artifactId>
- <version>1.8.2</version>
</dependency>
<dependency>
<groupId>junit</groupId>
@@ -109,82 +131,4 @@
</dependency>
</dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <configuration>
- <instructions>
-
<Export-Package>net.geant.perfsonar.*</Export-Package>
- </instructions>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-compiler-plugin</artifactId>
-
<version>2.3.2</version><!--$NO-MVN-MAN-VER$--> <!-- Groovy Eclipse Compiler
does not work with 3.0 -->
- <!-- This also means that one has to install
the Groovy-Eclipse configurator for m2Eclipse -->
- <!-- See
http://groovy.codehaus.org/Groovy-Eclipse+compiler+plugin+for+Maven#Groovy-EclipsecompilerpluginforMaven-Groovy-Eclipseconfiguratorform2Eclipse
-->
- <configuration>
-
<compilerId>groovy-eclipse-compiler</compilerId>
- <verbose>false</verbose>
- </configuration>
- <dependencies>
- <dependency>
-
<groupId>org.codehaus.groovy</groupId>
-
<artifactId>groovy-eclipse-compiler</artifactId>
- <version>2.7.0-01</version>
- </dependency>
- </dependencies>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <executions>
- <execution>
- <id>attach-tests-artifact</id>
- <goals>
- <goal>test-jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- <pluginManagement>
- <plugins>
- <!--This plugin's configuration is used to
store Eclipse m2e settings only. It has no influence on the Maven build
itself.-->
- <plugin>
- <groupId>org.eclipse.m2e</groupId>
-
<artifactId>lifecycle-mapping</artifactId>
- <version>1.0.0</version>
- <configuration>
- <lifecycleMappingMetadata>
- <pluginExecutions>
-
<pluginExecution>
-
<pluginExecutionFilter>
-
<groupId>
-
org.apache.maven.plugins
-
</groupId>
-
<artifactId>
-
maven-compiler-plugin
-
</artifactId>
-
<versionRange>
-
[2.3.2,)
-
</versionRange>
-
<goals>
-
<goal>testCompile</goal>
-
<goal>compile</goal>
-
</goals>
-
</pluginExecutionFilter>
-
<action>
-
<ignore></ignore>
-
</action>
-
</pluginExecution>
- </pluginExecutions>
- </lifecycleMappingMetadata>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
- </build>
</project>
Modified: trunk/perfsonar-base/sample-service/pom.xml
===================================================================
--- trunk/perfsonar-base/sample-service/pom.xml 2013-05-06 19:43:27 UTC (rev
6369)
+++ trunk/perfsonar-base/sample-service/pom.xml 2013-05-07 14:18:22 UTC (rev
6370)
@@ -5,15 +5,15 @@
<parent>
<groupId>net.geant.perfsonar</groupId>
<artifactId>parent</artifactId>
- <version>1.0.2</version>
+ <version>1.0.3-SNAPSHOT</version>
<relativePath>../../parent/</relativePath>
</parent>
<artifactId>sample-service</artifactId>
<version>1.0.0-SNAPSHOT</version>
<packaging>bundle</packaging>
-
- <name>Sample perfSONAR service and tests for the framework.</name>
+ <name>perfSONAR base 3 Sample Service and Tests</name>
+ <description>Sample perfSONAR service and tests for the pSbase3
framework.</description>
<scm>
<connection>scm:svn:http://svn.geant.net/GEANT/SA2/ps-java-services/trunk/perfsonar-base/sample-service/</connection>
@@ -21,25 +21,15 @@
<url>https://svn.geant.net/fisheye/browse/SA2T3-ps-java-services/trunk/perfsonar-base/sample-service/</url>
</scm>
- <developers>
- <developer>
- <id>blazej.pietrzak</id>
- <name>Blazej Pietrzak</name>
-
<email></email>
- <organization>PSNC</organization>
-
<organizationUrl>http://www.man.poznan.pl/</organizationUrl>
- <roles>
- <role>architect</role>
- <role>developer</role>
- </roles>
- <timezone>+1</timezone>
- </developer>
- </developers>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </build>
- <properties>
-
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- </properties>
-
<dependencies>
<dependency>
<groupId>net.geant.perfsonar.base</groupId>
@@ -107,17 +97,4 @@
</dependency>
</dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <configuration>
- <instructions>
-
<Export-Package>net.geant.perfsonar.*</Export-Package>
- </instructions>
- </configuration>
- </plugin>
- </plugins>
- </build>
</project>
- [pS-dev] [GEANT/SA2/ps-java-services] r6370 - in trunk: parent perfsonar-base/apt perfsonar-base/base perfsonar-base/ls perfsonar-base/messaging perfsonar-base/sample-service, svn-noreply, 05/07/2013
Archive powered by MHonArc 2.6.16.