Skip to content

add gitignore #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
lwang-cityway wants to merge 6 commits into
base: master
Choose a base branch
from
Open

add gitignore #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
2cc429a
integration gtfs
Dec 4, 2012
193f4f0
remove old directory
Dec 6, 2012
92de5d6
add gitignore
Dec 6, 2012
dcbd505
Merge branch 'gtfs-refactoring'
Dec 11, 2012
ec94301
Merge remote-tracking branch 'remotes/upstream/master'
Dec 11, 2012
0e428d3
Merge remote-tracking branch 'remotes/upstream/master'
Dec 17, 2012
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
330 changes: 165 additions & 165 deletions chouette-command/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,165 +1,165 @@
<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>chouette</artifactId>
<groupId>fr.certu.chouette</groupId>
<version>2.0.1</version>
</parent>
<groupId>fr.certu.chouette</groupId>
<artifactId>chouette-command</artifactId>
<name>Chouette Command</name>
<version>2.0.1</version>
<dependencies>
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
</dependency>
<dependency>
<groupId>fr.certu.chouette</groupId>
<artifactId>chouette-exchange-neptune</artifactId>
</dependency>
<dependency>
<groupId>fr.certu.chouette</groupId>
<artifactId>chouette-exchange-csv</artifactId>
</dependency>
<dependency>
<groupId>fr.certu.chouette</groupId>
<artifactId>chouette-exchange-gtfs</artifactId>
</dependency>
<dependency>
<groupId>fr.certu.chouette</groupId>
<artifactId>chouette-export-geoportail</artifactId>
</dependency>
<dependency>
<groupId>fr.certu.chouette.schema</groupId>
<artifactId>chouette-castor-neptune</artifactId>
</dependency>
<dependency>
<groupId>fr.certu.chouette</groupId>
<artifactId>chouette-core</artifactId>
</dependency>
<dependency>
<groupId>fr.certu.chouette</groupId>
<artifactId>chouette-hibernate-dao</artifactId>
</dependency>
<dependency>
<groupId>fr.certu.chouette</groupId>
<artifactId>chouette-validation</artifactId>
</dependency>
<dependency>
<groupId>fr.certu.chouette</groupId>
<artifactId>chouette-jdbc-dao</artifactId>
</dependency>
<!-- Spring -->
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
</dependency>
<!-- Postgres -->
<dependency>
<groupId>postgresql</groupId>
<artifactId>postgresql</artifactId>
</dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
</dependency>
<!-- testing -->
<dependency>
<groupId>org.testng</groupId>
<artifactId>testng</artifactId>
</dependency>
</dependencies>
<build>
<resources>
<resource>
<directory>src/main/java/</directory>
<includes>
<include>**/*.properties</include>
</includes>
</resource>
<resource>
<directory>${basedir}/src/main/resources</directory>
<excludes>
<exclude>filtered/**</exclude>
</excludes>
<filtering>false</filtering>
</resource>
<resource>
<filtering>true</filtering>
<directory>src/main/scripts</directory>
<includes>
<include>*.bat</include>
<include>*.sh</include>
</includes>
<targetPath>${project.build.directory}</targetPath>
</resource>
<!-- <resource> <directory>${basedir}/src/main/resources/filtered</directory>
<filtering>true</filtering> <targetPath>${project.build.directory}</targetPath>
</resource> -->
<resource>
<directory>../config/dev</directory>
<filtering>false</filtering>
<targetPath>${project.build.directory}</targetPath>
</resource>
</resources>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<executions>
<execution>
<id>copy-dependencies</id>
<phase>prepare-package</phase>
<goals>
<goal>copy-dependencies</goal>
</goals>
</execution>
</executions>
<configuration>
<outputDirectory>${project.build.directory}/lib</outputDirectory>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<configuration>
<archive>
<manifest>
<classpathPrefix>lib/</classpathPrefix>
<addClasspath>true</addClasspath>
<mainClass>fr.certu.chouette.command.Command</mainClass>
</manifest>
<manifestEntries>
<Class-Path>.</Class-Path>
</manifestEntries>
</archive>
</configuration>
</plugin>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
<configuration>
<finalName>chouette-cmd_${project.version}</finalName>
<appendAssemblyId>false</appendAssemblyId>
<descriptors>
<descriptor>src/main/resources/assemblies/cbc.xml</descriptor>
</descriptors>
</configuration>
<executions>
<execution>
<id>make-assembly</id> <!-- this is used for inheritance merges -->
<phase>package</phase> <!-- append to the packaging phase. -->
<goals>
<goal>single</goal> <!-- goals == mojos -->
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>
<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>chouette</artifactId>
<groupId>fr.certu.chouette</groupId>
<version>2.0.1</version>
</parent>
<groupId>fr.certu.chouette</groupId>
<artifactId>chouette-command</artifactId>
<name>Chouette Command</name>
<version>2.0.1</version>

<dependencies>
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
</dependency>
<dependency>
<groupId>fr.certu.chouette</groupId>
<artifactId>chouette-exchange-neptune</artifactId>
</dependency>
<dependency>
<groupId>fr.certu.chouette</groupId>
<artifactId>chouette-exchange-csv</artifactId>
</dependency>
<dependency>
<groupId>fr.certu.chouette</groupId>
<artifactId>chouette-exchange-gtfs</artifactId>
</dependency>
<dependency>
<groupId>fr.certu.chouette</groupId>
<artifactId>chouette-export-geoportail</artifactId>
</dependency>
<dependency>
<groupId>fr.certu.chouette.schema</groupId>
<artifactId>chouette-castor-neptune</artifactId>
</dependency>
<dependency>
<groupId>fr.certu.chouette</groupId>
<artifactId>chouette-core</artifactId>
</dependency>
<dependency>
<groupId>fr.certu.chouette</groupId>
<artifactId>chouette-hibernate-dao</artifactId>
</dependency>
<dependency>
<groupId>fr.certu.chouette</groupId>
<artifactId>chouette-validation</artifactId>
</dependency>
<dependency>
<groupId>fr.certu.chouette</groupId>
<artifactId>chouette-jdbc-dao</artifactId>
</dependency>
<!-- Spring -->
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
</dependency>
<!-- Postgres -->
<dependency>
<groupId>postgresql</groupId>
<artifactId>postgresql</artifactId>
</dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
</dependency>
<!-- testing -->
<dependency>
<groupId>org.testng</groupId>
<artifactId>testng</artifactId>
</dependency>

</dependencies>
<build>
<resources>
<resource>
<directory>src/main/java/</directory>
<includes>
<include>**/*.properties</include>
</includes>
</resource>
<resource>
<directory>${basedir}/src/main/resources</directory>
<excludes>
<exclude>filtered/**</exclude>
</excludes>
<filtering>false</filtering>
</resource>
<resource>
<filtering>true</filtering>
<directory>src/main/scripts</directory>
<includes>
<include>*.bat</include>
<include>*.sh</include>
</includes>
<targetPath>${project.build.directory}</targetPath>
</resource>
<!-- <resource> <directory>${basedir}/src/main/resources/filtered</directory>
<filtering>true</filtering> <targetPath>${project.build.directory}</targetPath>
</resource> -->
<resource>
<directory>../config/dev</directory>
<filtering>false</filtering>
<targetPath>${project.build.directory}</targetPath>
</resource>
</resources>

<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<executions>
<execution>
<id>copy-dependencies</id>
<phase>prepare-package</phase>
<goals>
<goal>copy-dependencies</goal>
</goals>
</execution>
</executions>
<configuration>
<outputDirectory>${project.build.directory}/lib</outputDirectory>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<configuration>
<archive>
<manifest>
<classpathPrefix>lib/</classpathPrefix>
<addClasspath>true</addClasspath>
<mainClass>fr.certu.chouette.command.Command</mainClass>
</manifest>
<manifestEntries>
<Class-Path>.</Class-Path>
</manifestEntries>
</archive>
</configuration>
</plugin>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
<configuration>
<finalName>chouette-cmd_${project.version}</finalName>
<appendAssemblyId>false</appendAssemblyId>
<descriptors>
<descriptor>src/main/resources/assemblies/cbc.xml</descriptor>
</descriptors>
</configuration>
<executions>
<execution>
<id>make-assembly</id> <!-- this is used for inheritance merges -->
<phase>package</phase> <!-- append to the packaging phase. -->
<goals>
<goal>single</goal> <!-- goals == mojos -->
</goals>
</execution>
</executions>
</plugin>

</plugins>
</build>
</project>
Loading