Author: kono
Date: 2011-05-26 14:50:10 -0700 (Thu, 26 May 2011)
New Revision: 25552
Modified:
core3/archetypes/trunk/api-provider-plugin/src/main/resources/archetype-resources/pom.xml
core3/archetypes/trunk/cyaction-plugin/src/main/resources/archetype-resources/pom.xml
core3/archetypes/trunk/task-plugin/src/main/resources/archetype-resources/pom.xml
Log:
Fixed broken archetypes for Cytoscape 3. Also all archetypes use latest
version of maven plugins.
Modified:
core3/archetypes/trunk/api-provider-plugin/src/main/resources/archetype-resources/pom.xml
===================================================================
---
core3/archetypes/trunk/api-provider-plugin/src/main/resources/archetype-resources/pom.xml
2011-05-26 20:57:20 UTC (rev 25551)
+++
core3/archetypes/trunk/api-provider-plugin/src/main/resources/archetype-resources/pom.xml
2011-05-26 21:50:10 UTC (rev 25552)
@@ -42,7 +42,6 @@
<showWarnings>true</showWarnings>
<showDeprecation>true</showDeprecation>
<compilerArguments>
- <Xlint:all></Xlint:all>
<Xlint:-path></Xlint:-path>
<Xmaxwarns>10000</Xmaxwarns>
<Xmaxerrs>10000</Xmaxerrs>
@@ -59,14 +58,14 @@
<plugin>
<groupId>org.ops4j</groupId>
<artifactId>maven-pax-plugin</artifactId>
- <version>1.5-SNAPSHOT</version>
+ <version>1.5</version>
<extensions>true</extensions>
</plugin>
<!-- Generates the OSGi metadata based on the osgi.bnd
file. -->
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>1.4.3</version>
+ <version>2.3.4</version>
<configuration>
<instructions>
#literal()
Modified:
core3/archetypes/trunk/cyaction-plugin/src/main/resources/archetype-resources/pom.xml
===================================================================
---
core3/archetypes/trunk/cyaction-plugin/src/main/resources/archetype-resources/pom.xml
2011-05-26 20:57:20 UTC (rev 25551)
+++
core3/archetypes/trunk/cyaction-plugin/src/main/resources/archetype-resources/pom.xml
2011-05-26 21:50:10 UTC (rev 25552)
@@ -2,9 +2,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";>
<properties>
-
<bundle.symbolicName>${groupId}.${artifactId}</bundle.symbolicName>
- <bundle.namespace>${groupId}</bundle.namespace>
- <junit.version>4.8.2</junit.version>
+ #if( !$symbolicName )
+ #set( $symbolicName = "${groupId}.${artifactId}" )
+ #end
+ <bundle.symbolicName>${symbolicName}</bundle.symbolicName>
+ <bundle.namespace>${package}</bundle.namespace>
</properties>
<modelVersion>4.0.0</modelVersion>
@@ -12,7 +14,12 @@
<artifactId>${artifactId}</artifactId>
<version>${version}</version>
- <name>${bundle.symbolicName} [${bundle.namespace}]</name>
+ #set( $dollar = "$" )
+ #if( $symbolicName.equals($package) )
+ <name>${dollar}{bundle.symbolicName}</name>
+ #else
+ <name>${dollar}{bundle.symbolicName}
[${dollar}{bundle.namespace}]</name>
+ #end
<packaging>bundle</packaging>
@@ -49,18 +56,20 @@
<plugin>
<groupId>org.ops4j</groupId>
<artifactId>maven-pax-plugin</artifactId>
- <version>1.5-SNAPSHOT</version>
+ <version>1.5</version>
<extensions>true</extensions>
</plugin>
<!-- Generates the OSGi metadata based on the osgi.bnd
file. -->
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>1.4.3</version>
+ <version>2.3.4</version>
<configuration>
<instructions>
+ #literal()
<Bundle-SymbolicName>${bundle.symbolicName}</Bundle-SymbolicName>
<Bundle-Version>${pom.version}</Bundle-Version>
+ #end
<_include>-osgi.bnd</_include>
</instructions>
</configuration>
@@ -117,7 +126,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>${junit.version}</version>
+ <version>4.8.2</version>
<scope>test</scope>
</dependency>
<dependency>
Modified:
core3/archetypes/trunk/task-plugin/src/main/resources/archetype-resources/pom.xml
===================================================================
---
core3/archetypes/trunk/task-plugin/src/main/resources/archetype-resources/pom.xml
2011-05-26 20:57:20 UTC (rev 25551)
+++
core3/archetypes/trunk/task-plugin/src/main/resources/archetype-resources/pom.xml
2011-05-26 21:50:10 UTC (rev 25552)
@@ -43,7 +43,6 @@
<showWarnings>true</showWarnings>
<showDeprecation>true</showDeprecation>
<compilerArguments>
- <Xlint:all></Xlint:all>
<Xlint:-path></Xlint:-path>
<Xmaxwarns>10000</Xmaxwarns>
<Xmaxerrs>10000</Xmaxerrs>
@@ -60,14 +59,14 @@
<plugin>
<groupId>org.ops4j</groupId>
<artifactId>maven-pax-plugin</artifactId>
- <version>1.4</version>
+ <version>1.5</version>
<extensions>true</extensions>
</plugin>
<!-- Generates the OSGi metadata based on the osgi.bnd
file. -->
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>1.4.3</version>
+ <version>2.3.4</version>
<configuration>
<instructions>
#literal()
--
You received this message because you are subscribed to the Google Groups
"cytoscape-cvs" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/cytoscape-cvs?hl=en.
