Fixed version mess in pom files

This commit is contained in:
ebner
2011-10-21 14:35:31 +02:00
parent d26cdd473c
commit 31a459b87a
8 changed files with 138 additions and 151 deletions

View File

@@ -100,24 +100,24 @@
<artifactId>maven-resources-plugin</artifactId>
<version>2.5</version>
<executions>
<execution>
<id>copy-resources</id>
<execution>
<id>copy-resources</id>
<!-- here the phase you need -->
<phase>compile</phase>
<goals>
<goal>copy-resources</goal>
</goals>
<configuration>
<outputDirectory>${basedir}/target/fda/bin</outputDirectory>
<resources>
<resource>
<directory>src/main/scripts</directory>
</resource>
</resources>
</configuration>
</execution>
<phase>compile</phase>
<goals>
<goal>copy-resources</goal>
</goals>
<configuration>
<outputDirectory>${basedir}/target/fda/bin</outputDirectory>
<resources>
<resource>
<directory>src/main/scripts</directory>
</resource>
</resources>
</configuration>
</execution>
</executions>
</plugin>
</plugin>
</plugins>
</build>

View File

@@ -1,32 +1,32 @@
<?xml version="1.0" encoding="UTF-8"?>
<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/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>ch.psi</groupId>
<artifactId>fda.ui</artifactId>
<version>1.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>ch.psi</groupId>
<artifactId>fda.ui</artifactId>
<version>1.0.0-SNAPSHOT</version>
</parent>
<artifactId>branding</artifactId>
<packaging>nbm</packaging>
<artifactId>branding</artifactId>
<packaging>nbm</packaging>
<name>fda.ui - NB App Branding</name>
<name>fda.ui - NB App Branding</name>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
<dependencies>
<dependency>
<groupId>org.netbeans.api</groupId>
<artifactId>org-netbeans-api-annotations-common</artifactId>
<version>${netbeans.version}</version>
</dependency>
</dependencies>
<dependencies>
<dependency>
<groupId>org.netbeans.api</groupId>
<artifactId>org-netbeans-api-annotations-common</artifactId>
<version>${netbeans.version}</version>
</dependency>
</dependencies>
<build>
<plugins>
<build>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>nbm-maven-plugin</artifactId>
@@ -39,6 +39,6 @@
<useDefaultManifestFile>true</useDefaultManifestFile>
</configuration>
</plugin>
</plugins>
</build>
</plugins>
</build>
</project>

View File

@@ -2,14 +2,12 @@
<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/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>fda.ui</artifactId>
<groupId>ch.psi</groupId>
<version>1.0.0-SNAPSHOT</version>
</parent>
<artifactId>fda.ui</artifactId>
<groupId>ch.psi</groupId>
<version>1.0.0-SNAPSHOT</version>
</parent>
<groupId>ch.psi</groupId>
<artifactId>fda.ui.cdump</artifactId>
<version>1.0.0-SNAPSHOT</version>
<packaging>nbm</packaging>
<name>fda.ui.cdump NetBeans Module</name>
@@ -38,54 +36,54 @@
<dependency>
<groupId>org.netbeans.api</groupId>
<artifactId>org-netbeans-api-annotations-common</artifactId>
<version>RELEASE701</version>
<version>${netbeans.version}</version>
</dependency>
<dependency>
<groupId>org.netbeans.api</groupId>
<artifactId>org-openide-util</artifactId>
<version>RELEASE701</version>
<version>${netbeans.version}</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.netbeans.api</groupId>
<artifactId>org-openide-windows</artifactId>
<version>RELEASE701</version>
<version>${netbeans.version}</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.netbeans.api</groupId>
<artifactId>org-netbeans-modules-settings</artifactId>
<version>RELEASE701</version>
<version>${netbeans.version}</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.netbeans.api</groupId>
<artifactId>org-openide-io</artifactId>
<version>RELEASE701</version>
<version>${netbeans.version}</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.netbeans.api</groupId>
<artifactId>org-openide-util-lookup</artifactId>
<version>RELEASE701</version>
<version>${netbeans.version}</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.netbeans.api</groupId>
<artifactId>org-openide-awt</artifactId>
<version>RELEASE701</version>
<version>${netbeans.version}</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.netbeans.api</groupId>
<artifactId>org-openide-dialogs</artifactId>
<version>RELEASE701</version>
<version>${netbeans.version}</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>ch.psi</groupId>
<artifactId>fda.ui.preferences</artifactId>
<version>1.0.0-SNAPSHOT</version>
<version>${project.version}</version>
<type>nbm</type>
</dependency>
<dependency>
@@ -101,7 +99,6 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>nbm-maven-plugin</artifactId>
<version>3.5</version>
<extensions>true</extensions>
</plugin>

View File

@@ -2,14 +2,12 @@
<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/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>fda.ui</artifactId>
<groupId>ch.psi</groupId>
<version>1.0.0-SNAPSHOT</version>
</parent>
<artifactId>fda.ui</artifactId>
<groupId>ch.psi</groupId>
<version>1.0.0-SNAPSHOT</version>
</parent>
<groupId>ch.psi</groupId>
<artifactId>fda.ui.ce</artifactId>
<version>1.0.0-SNAPSHOT</version>
<packaging>nbm</packaging>
<name>fda.ui.ce NetBeans Module</name>
@@ -38,84 +36,83 @@
<dependency>
<groupId>org.netbeans.api</groupId>
<artifactId>org-netbeans-api-annotations-common</artifactId>
<version>RELEASE701</version>
<version>${netbeans.version}</version>
</dependency>
<dependency>
<groupId>org.netbeans.api</groupId>
<artifactId>org-openide-filesystems</artifactId>
<version>RELEASE701</version>
<version>${netbeans.version}</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.netbeans.api</groupId>
<artifactId>org-openide-loaders</artifactId>
<version>RELEASE701</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>ch.psi</groupId>
<artifactId>fda.ui.preferences</artifactId>
<version>1.0.0-SNAPSHOT</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>ch.psi</groupId>
<artifactId>fda.ui.ee</artifactId>
<version>1.0.0-SNAPSHOT</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>ch.psi</groupId>
<artifactId>fda.ui.cm</artifactId>
<version>1.0.0-SNAPSHOT</version>
<version>${netbeans.version}</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.netbeans.api</groupId>
<artifactId>org-netbeans-modules-settings</artifactId>
<version>RELEASE701</version>
<version>${netbeans.version}</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.netbeans.api</groupId>
<artifactId>org-openide-io</artifactId>
<version>RELEASE701</version>
<version>${netbeans.version}</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.netbeans.api</groupId>
<artifactId>org-openide-util</artifactId>
<version>RELEASE701</version>
<version>${netbeans.version}</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.netbeans.api</groupId>
<artifactId>org-openide-util-lookup</artifactId>
<version>RELEASE701</version>
<version>${netbeans.version}</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.netbeans.api</groupId>
<artifactId>org-openide-dialogs</artifactId>
<version>RELEASE701</version>
<version>${netbeans.version}</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.netbeans.api</groupId>
<artifactId>org-openide-nodes</artifactId>
<version>RELEASE701</version>
<version>${netbeans.version}</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.netbeans.api</groupId>
<artifactId>org-openide-windows</artifactId>
<version>RELEASE701</version>
<version>${netbeans.version}</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>ch.psi</groupId>
<artifactId>fda.ui.preferences</artifactId>
<version>${project.version}</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>ch.psi</groupId>
<artifactId>fda.ui.ee</artifactId>
<version>${project.version}</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>ch.psi</groupId>
<artifactId>fda.ui.cm</artifactId>
<version>${project.version}</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.8.1</version>
<scope>test</scope>
<type>jar</type>
</dependency>
@@ -126,7 +123,6 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>nbm-maven-plugin</artifactId>
<version>3.5</version>
<extensions>true</extensions>
</plugin>

View File

@@ -2,14 +2,12 @@
<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/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>fda.ui</artifactId>
<groupId>ch.psi</groupId>
<version>1.0.0-SNAPSHOT</version>
</parent>
<artifactId>fda.ui</artifactId>
<groupId>ch.psi</groupId>
<version>1.0.0-SNAPSHOT</version>
</parent>
<groupId>ch.psi</groupId>
<artifactId>fda.ui.cm</artifactId>
<version>1.0.0-SNAPSHOT</version>
<packaging>nbm</packaging>
<name>fda.ui.cm NetBeans Module</name>
@@ -38,66 +36,66 @@
<dependency>
<groupId>org.netbeans.api</groupId>
<artifactId>org-netbeans-api-annotations-common</artifactId>
<version>RELEASE701</version>
<version>${netbeans.version}</version>
</dependency>
<dependency>
<groupId>org.netbeans.api</groupId>
<artifactId>org-openide-filesystems</artifactId>
<version>RELEASE701</version>
<version>${netbeans.version}</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.netbeans.api</groupId>
<artifactId>org-openide-loaders</artifactId>
<version>RELEASE701</version>
<version>${netbeans.version}</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.netbeans.api</groupId>
<artifactId>org-openide-util</artifactId>
<version>RELEASE701</version>
<version>${netbeans.version}</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.netbeans.api</groupId>
<artifactId>org-openide-util-lookup</artifactId>
<version>RELEASE701</version>
<version>${netbeans.version}</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.netbeans.api</groupId>
<artifactId>org-openide-explorer</artifactId>
<version>RELEASE701</version>
<version>${netbeans.version}</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.netbeans.api</groupId>
<artifactId>org-openide-nodes</artifactId>
<version>RELEASE701</version>
<version>${netbeans.version}</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.netbeans.api</groupId>
<artifactId>org-openide-text</artifactId>
<version>RELEASE701</version>
<version>${netbeans.version}</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.netbeans.api</groupId>
<artifactId>org-openide-windows</artifactId>
<version>RELEASE701</version>
<version>${netbeans.version}</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>ch.psi</groupId>
<artifactId>fda.ui.preferences</artifactId>
<version>1.0-SNAPSHOT</version>
<version>${project.version}</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>ch.psi</groupId>
<artifactId>fda.ui.ee</artifactId>
<version>1.0.0-SNAPSHOT</version>
<version>${project.version}</version>
<type>jar</type>
</dependency>
</dependencies>
@@ -107,7 +105,6 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>nbm-maven-plugin</artifactId>
<version>3.5</version>
<extensions>true</extensions>
<configuration>
<publicPackages>

View File

@@ -6,6 +6,7 @@
<groupId>ch.psi</groupId>
<version>1.0.0-SNAPSHOT</version>
</parent>
<artifactId>fda.ui.ee</artifactId>
<packaging>nbm</packaging>
@@ -24,18 +25,6 @@
</repositories>
<dependencies>
<dependency>
<groupId>ch.psi</groupId>
<artifactId>fda.ui.preferences</artifactId>
<version>1.0.0-SNAPSHOT</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>ch.psi</groupId>
<artifactId>fda</artifactId>
<version>1.1.27</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.netbeans.api</groupId>
<artifactId>org-openide-util</artifactId>
@@ -89,6 +78,18 @@
<version>${netbeans.version}</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>ch.psi</groupId>
<artifactId>fda.ui.preferences</artifactId>
<version>${project.version}</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>ch.psi</groupId>
<artifactId>fda</artifactId>
<version>1.1.27</version>
<type>jar</type>
</dependency>
</dependencies>
<build>

View File

@@ -2,14 +2,12 @@
<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/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>fda.ui</artifactId>
<groupId>ch.psi</groupId>
<version>1.0.0-SNAPSHOT</version>
</parent>
<artifactId>fda.ui</artifactId>
<groupId>ch.psi</groupId>
<version>1.0.0-SNAPSHOT</version>
</parent>
<groupId>ch.psi</groupId>
<artifactId>fda.ui.preferences</artifactId>
<version>1.0.0-SNAPSHOT</version>
<packaging>nbm</packaging>
<name>fda.ui.preferences NetBeans Module</name>
@@ -76,7 +74,6 @@
<version>${netbeans.version}</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.netbeans.api</groupId>
<artifactId>org-openide-windows</artifactId>
@@ -99,7 +96,6 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>nbm-maven-plugin</artifactId>
<version>3.5</version>
<extensions>true</extensions>
<configuration>
<publicPackages>

44
pom.xml
View File

@@ -56,37 +56,37 @@
<target>1.6</target>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>2.3.1</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>2.3.1</version>
</plugin>
</plugins>
</pluginManagement>
</build>
<distributionManagement>
<snapshotRepository>
<id>i.snapshots</id>
<name>Artifactory Snapshots</name>
<url>http://slsyoke1/artifactory/libs-snapshots-local</url>
</snapshotRepository>
<repository>
<id>i.releases</id>
<name>Atrifactory Releases</name>
<url>http://slsyoke1/artifactory/libs-releases-local</url>
</repository>
</distributionManagement>
<snapshotRepository>
<id>i.snapshots</id>
<name>Artifactory Snapshots</name>
<url>http://slsyoke1/artifactory/libs-snapshots-local</url>
</snapshotRepository>
<repository>
<id>i.releases</id>
<name>Atrifactory Releases</name>
<url>http://slsyoke1/artifactory/libs-releases-local</url>
</repository>
</distributionManagement>
<modules>
<module>branding</module>
<module>application</module>
<module>fda.ui.ee</module>
<module>fda.ui.preferences</module>
<module>fda.ui.ce</module>
<module>fda.ui.cm</module>
<module>fda.ui.cdump</module>
</modules>
<module>fda.ui.ee</module>
<module>fda.ui.preferences</module>
<module>fda.ui.ce</module>
<module>fda.ui.cm</module>
<module>fda.ui.cdump</module>
</modules>
<properties>
<netbeans.version>RELEASE701</netbeans.version>