Author: kono
Date: 2012-04-09 18:28:07 -0700 (Mon, 09 Apr 2012)
New Revision: 28778
Modified:
core3/support/trunk/archetypes/api-provider-app/pom.xml
core3/support/trunk/archetypes/api-provider-app/src/main/resources/META-INF/maven/archetype-metadata.xml
core3/support/trunk/archetypes/api-provider-app/src/main/resources/archetype-resources/pom.xml
core3/support/trunk/archetypes/cyaction-app/pom.xml
core3/support/trunk/archetypes/cyaction-app/src/main/resources/META-INF/maven/archetype-metadata.xml
core3/support/trunk/archetypes/cyaction-app/src/main/resources/archetype-resources/pom.xml
core3/support/trunk/archetypes/pom.xml
core3/support/trunk/archetypes/task-app/pom.xml
core3/support/trunk/archetypes/task-app/src/main/resources/META-INF/maven/archetype-metadata.xml
core3/support/trunk/archetypes/task-app/src/main/resources/archetype-resources/pom.xml
Log:
Archetype pom files had been fixed to make them M2Eclipse compatible. Maven
plugin versions had been updated to the latest ones.
Modified: core3/support/trunk/archetypes/api-provider-app/pom.xml
===================================================================
--- core3/support/trunk/archetypes/api-provider-app/pom.xml 2012-04-10
00:46:50 UTC (rev 28777)
+++ core3/support/trunk/archetypes/api-provider-app/pom.xml 2012-04-10
01:28:07 UTC (rev 28778)
@@ -11,7 +11,7 @@
<groupId>org.cytoscape.archetypes</groupId>
<artifactId>api-provider-app</artifactId>
<packaging>maven-archetype</packaging>
- <name>Cytoscape 3 Archetype - API Provider App</name>
+ <name>Cytoscape 3 Archetype - Creates an App providing public API</name>
<build>
<plugins>
Modified:
core3/support/trunk/archetypes/api-provider-app/src/main/resources/META-INF/maven/archetype-metadata.xml
===================================================================
---
core3/support/trunk/archetypes/api-provider-app/src/main/resources/META-INF/maven/archetype-metadata.xml
2012-04-10 00:46:50 UTC (rev 28777)
+++
core3/support/trunk/archetypes/api-provider-app/src/main/resources/META-INF/maven/archetype-metadata.xml
2012-04-10 01:28:07 UTC (rev 28778)
@@ -17,11 +17,5 @@
<include>**/*.xml</include>
</includes>
</fileSet>
- <fileSet encoding="UTF-8">
- <directory></directory>
- <includes>
- <include>osgi.bnd</include>
- </includes>
- </fileSet>
</fileSets>
</archetype-descriptor>
Modified:
core3/support/trunk/archetypes/api-provider-app/src/main/resources/archetype-resources/pom.xml
===================================================================
---
core3/support/trunk/archetypes/api-provider-app/src/main/resources/archetype-resources/pom.xml
2012-04-10 00:46:50 UTC (rev 28777)
+++
core3/support/trunk/archetypes/api-provider-app/src/main/resources/archetype-resources/pom.xml
2012-04-10 01:28:07 UTC (rev 28778)
@@ -59,7 +59,6 @@
<showWarnings>true</showWarnings>
<showDeprecation>true</showDeprecation>
<compilerArguments>
- <Xlint:-path></Xlint:-path>
<Xmaxwarns>10000</Xmaxwarns>
<Xmaxerrs>10000</Xmaxerrs>
</compilerArguments>
@@ -73,17 +72,12 @@
<redirectTestOutputToFile>true</redirectTestOutputToFile>
</configuration>
</plugin>
- <plugin>
- <groupId>org.ops4j</groupId>
- <artifactId>maven-pax-plugin</artifactId>
- <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>2.3.4</version>
+ <version>2.3.7</version>
+ <extensions>true</extensions>
<configuration>
<instructions>
#literal()
Modified: core3/support/trunk/archetypes/cyaction-app/pom.xml
===================================================================
--- core3/support/trunk/archetypes/cyaction-app/pom.xml 2012-04-10 00:46:50 UTC
(rev 28777)
+++ core3/support/trunk/archetypes/cyaction-app/pom.xml 2012-04-10 01:28:07 UTC
(rev 28778)
@@ -11,7 +11,7 @@
<groupId>org.cytoscape.archetypes</groupId>
<artifactId>cyaction-app</artifactId>
<packaging>maven-archetype</packaging>
- <name>Cytoscape 3 Archetype - Creates CyAction (menu item) for desktop
application</name>
+ <name>Cytoscape 3 Archetype - Creates a CyAction (menu item) for
desktop application</name>
<build>
<plugins>
Modified:
core3/support/trunk/archetypes/cyaction-app/src/main/resources/META-INF/maven/archetype-metadata.xml
===================================================================
---
core3/support/trunk/archetypes/cyaction-app/src/main/resources/META-INF/maven/archetype-metadata.xml
2012-04-10 00:46:50 UTC (rev 28777)
+++
core3/support/trunk/archetypes/cyaction-app/src/main/resources/META-INF/maven/archetype-metadata.xml
2012-04-10 01:28:07 UTC (rev 28778)
@@ -17,11 +17,5 @@
<include>**/*.xml</include>
</includes>
</fileSet>
- <fileSet encoding="UTF-8">
- <directory></directory>
- <includes>
- <include>osgi.bnd</include>
- </includes>
- </fileSet>
</fileSets>
</archetype-descriptor>
Modified:
core3/support/trunk/archetypes/cyaction-app/src/main/resources/archetype-resources/pom.xml
===================================================================
---
core3/support/trunk/archetypes/cyaction-app/src/main/resources/archetype-resources/pom.xml
2012-04-10 00:46:50 UTC (rev 28777)
+++
core3/support/trunk/archetypes/cyaction-app/src/main/resources/archetype-resources/pom.xml
2012-04-10 01:28:07 UTC (rev 28778)
@@ -71,17 +71,12 @@
<redirectTestOutputToFile>true</redirectTestOutputToFile>
</configuration>
</plugin>
- <plugin>
- <groupId>org.ops4j</groupId>
- <artifactId>maven-pax-plugin</artifactId>
- <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>2.3.4</version>
+ <version>2.3.7</version>
+ <extensions>true</extensions>
<configuration>
<instructions>
#literal()
Modified: core3/support/trunk/archetypes/pom.xml
===================================================================
--- core3/support/trunk/archetypes/pom.xml 2012-04-10 00:46:50 UTC (rev
28777)
+++ core3/support/trunk/archetypes/pom.xml 2012-04-10 01:28:07 UTC (rev
28778)
@@ -7,8 +7,6 @@
<version>3.0.0-alpha7-SNAPSHOT</version>
</parent>
-
- <groupId>org.cytoscape</groupId>
<artifactId>archetypes-parent</artifactId>
<packaging>pom</packaging>
<name>Cytoscape 3 App Archetypes Parent</name>
@@ -50,13 +48,13 @@
<extension>
<groupId>org.apache.maven.archetype</groupId>
<artifactId>archetype-packaging</artifactId>
- <version>2.0</version>
+ <version>2.2</version>
</extension>
</extensions>
<plugins>
<plugin>
<artifactId>maven-archetype-plugin</artifactId>
- <version>2.0</version>
+ <version>2.2</version>
<extensions>true</extensions>
</plugin>
<plugin>
Modified: core3/support/trunk/archetypes/task-app/pom.xml
===================================================================
--- core3/support/trunk/archetypes/task-app/pom.xml 2012-04-10 00:46:50 UTC
(rev 28777)
+++ core3/support/trunk/archetypes/task-app/pom.xml 2012-04-10 01:28:07 UTC
(rev 28778)
@@ -11,7 +11,7 @@
<groupId>org.cytoscape.archetypes</groupId>
<artifactId>task-app</artifactId>
<packaging>maven-archetype</packaging>
- <name>Cytoscape 3 Archetype - Cytoscape Task App</name>
+ <name>Cytoscape 3 Archetype - Creates an App with a Task</name>
<build>
<plugins>
Modified:
core3/support/trunk/archetypes/task-app/src/main/resources/META-INF/maven/archetype-metadata.xml
===================================================================
---
core3/support/trunk/archetypes/task-app/src/main/resources/META-INF/maven/archetype-metadata.xml
2012-04-10 00:46:50 UTC (rev 28777)
+++
core3/support/trunk/archetypes/task-app/src/main/resources/META-INF/maven/archetype-metadata.xml
2012-04-10 01:28:07 UTC (rev 28778)
@@ -17,11 +17,5 @@
<include>**/*.xml</include>
</includes>
</fileSet>
- <fileSet encoding="UTF-8">
- <directory></directory>
- <includes>
- <include>osgi.bnd</include>
- </includes>
- </fileSet>
</fileSets>
</archetype-descriptor>
Modified:
core3/support/trunk/archetypes/task-app/src/main/resources/archetype-resources/pom.xml
===================================================================
---
core3/support/trunk/archetypes/task-app/src/main/resources/archetype-resources/pom.xml
2012-04-10 00:46:50 UTC (rev 28777)
+++
core3/support/trunk/archetypes/task-app/src/main/resources/archetype-resources/pom.xml
2012-04-10 01:28:07 UTC (rev 28778)
@@ -59,8 +59,7 @@
<optimize>true</optimize>
<showWarnings>true</showWarnings>
<showDeprecation>true</showDeprecation>
- <compilerArguments>
- <Xlint:-path></Xlint:-path>
+ <compilerArguments>
<Xmaxwarns>10000</Xmaxwarns>
<Xmaxerrs>10000</Xmaxerrs>
</compilerArguments>
@@ -74,17 +73,12 @@
<redirectTestOutputToFile>true</redirectTestOutputToFile>
</configuration>
</plugin>
- <plugin>
- <groupId>org.ops4j</groupId>
- <artifactId>maven-pax-plugin</artifactId>
- <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>2.3.4</version>
+ <version>2.3.7</version>
+ <extensions>true</extensions>
<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.
