Skip to content

Commit

Permalink
Merge branch 'master' of git@github.com:objectledge/maven-extensions.git
Browse files Browse the repository at this point in the history
  • Loading branch information
@rkrzewski
rkrzewski committed Jul 13, 2011
2 parents 0077478 + 70778f4 commit 70c6f0c
Show file tree
Hide file tree
Showing 9 changed files with 45 additions and 201 deletions.
18 changes: 0 additions & 18 deletions connectors/modules/ckpackager/tests/settings.xml
View file

This file was deleted.

18 changes: 0 additions & 18 deletions connectors/modules/coral/tests/settings.xml
View file

This file was deleted.

18 changes: 0 additions & 18 deletions connectors/modules/javacc/tests/settings.xml
View file

This file was deleted.

18 changes: 0 additions & 18 deletions connectors/modules/jflex/tests/settings.xml
View file

This file was deleted.

18 changes: 0 additions & 18 deletions connectors/modules/jsc/tests/settings.xml
View file

This file was deleted.

18 changes: 0 additions & 18 deletions connectors/modules/scm/tests/settings.xml
View file

This file was deleted.

36 changes: 1 addition & 35 deletions connectors/pom.xml
View file
Expand Up @@ -79,9 +79,6 @@
<artifactId>target-platform-configuration</artifactId>
<version>${tycho-version}</version>
<configuration>
<resolver>p2</resolver>
<pomDependencies>consider</pomDependencies>
<ignoreTychoRepositories>true</ignoreTychoRepositories>
<target>
<groupId>org.objectledge.maven.connectors</groupId>
<artifactId>target-platform</artifactId>
Expand Down Expand Up @@ -120,32 +117,12 @@
</plugins>
<pluginManagement>
<plugins>
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>maven-osgi-lifecycle-plugin</artifactId>
<version>${tycho-version}</version>
</plugin>
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-packaging-plugin</artifactId>
<version>${tycho-version}</version>
<configuration>
<!-- workaround for TYCHO-349 or TYCHO-313 -->
<strictVersions>false</strictVersions>
</configuration>
</plugin>
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-surefire-plugin</artifactId>
<version>${tycho-version}</version>
<configuration>
<useUIHarness>true</useUIHarness>
<includes>
<include>**/*Test.java</include>
</includes>
<argLine>${tycho.test.jvmArgs}</argLine>
<appArgLine>-eclipse.keyring target/keyring -eclipse.password resources/secure-storage-password.txt -pluginCustomization ${basedir}/plugin_customization.ini</appArgLine>
<forkedProcessTimeoutInSeconds>7200</forkedProcessTimeoutInSeconds>
<appArgLine>-pluginCustomization ${basedir}/plugin_customization.ini</appArgLine>
</configuration>
</plugin>
<plugin>
Expand All @@ -157,17 +134,6 @@
<target>1.5</target>
</configuration>
</plugin>
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-p2-plugin</artifactId>
<version>${tycho-version}</version>
</plugin>
<!-- important for self-hosting -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
<version>2.4.3</version>
</plugin>
</plugins>
</pluginManagement>
</build>
Expand Down
1 change: 0 additions & 1 deletion plugins/ckpackager-maven-plugin/pom.xml
View file
Expand Up @@ -33,7 +33,6 @@
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-api</artifactId>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.objectledge.ckpackager</groupId>
Expand Down
101 changes: 44 additions & 57 deletions pom.xml
View file
Expand Up @@ -13,13 +13,13 @@
-->
<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>org.sonatype.oss</groupId>
<artifactId>oss-parent</artifactId>
<version>7</version>
</parent>

<groupId>org.objectledge.maven</groupId>
<artifactId>parent</artifactId>
<version>2-SNAPSHOT</version>
Expand Down Expand Up @@ -74,67 +74,54 @@

<build>
<pluginManagement>
<plugins>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
<version>2.1</version>
<groupId>com.mycila.maven-license-plugin</groupId>
<artifactId>maven-license-plugin</artifactId>
<version>1.9.0</version>
<inherited>false</inherited>
<configuration>
<localCheckout>true</localCheckout>
<pushChanges>false</pushChanges>
<addSchema>false</addSchema>
<updateBranchVersions>true</updateBranchVersions>
<aggregate>true</aggregate>
<strictCheck>true</strictCheck>
<header>etc/license_header.txt</header>
<mapping>
<java>SLASHSTAR_STYLE</java>
<js>SLASHSTAR_STYLE</js>
<pack>SLASHSTAR_STYLE</pack>
<jflex>SLASHSTAR_STYLE</jflex>
<jj>SLASHSTAR_STYLE</jj>
<bsh>SLASHSTAR_STYLE</bsh>
<target>XML_STYLE</target>
<ini>SCRIPT_STYLE</ini>
<list>SCRIPT_STYLE</list>
<rml>SCRIPT_STYLE</rml>
</mapping>
<useDefaultExcludes>false</useDefaultExcludes>
<excludes>
<exclude>**/*~</exclude>
<exclude>**/target/**</exclude>
<exclude>**/release.properties</exclude>
<exclude>**/*.releaseBackup</exclude>
<exclude>**/.classpath</exclude>
<exclude>**/.project</exclude>
<exclude>**/.settings/**</exclude>
<exclude>**/MANIFEST.MF</exclude>
<exclude>**/*.jar</exclude>
<exclude>**/.gitignore</exclude>
<exclude>**/epl-v100.html</exclude>
<exclude>**/README*</exclude>
<exclude>**/.svn/**</exclude>
<exclude>**/.git/**</exclude>
<exclude>**/*.git/**</exclude>
<exclude>**/archetype-resources/**</exclude>
<exclude>**/archetypes/**/goal.txt</exclude>
<exclude>**/coral/tests/**Resource*.java</exclude>
<exclude>**/ckpackager/src/orig/**</exclude>
</excludes>
</configuration>
</plugin>
</plugins>
</pluginManagement>
<plugins>
<plugin>
<groupId>com.mycila.maven-license-plugin</groupId>
<artifactId>maven-license-plugin</artifactId>
<version>1.9.0</version>
<inherited>false</inherited>
<configuration>
<aggregate>true</aggregate>
<strictCheck>true</strictCheck>
<header>etc/license_header.txt</header>
<mapping>
<java>SLASHSTAR_STYLE</java>
<js>SLASHSTAR_STYLE</js>
<pack>SLASHSTAR_STYLE</pack>
<jflex>SLASHSTAR_STYLE</jflex>
<jj>SLASHSTAR_STYLE</jj>
<bsh>SLASHSTAR_STYLE</bsh>
<target>XML_STYLE</target>
<ini>SCRIPT_STYLE</ini>
<list>SCRIPT_STYLE</list>
<rml>SCRIPT_STYLE</rml>
</mapping>
<useDefaultExcludes>false</useDefaultExcludes>
<excludes>
<exclude>**/*~</exclude>
<exclude>**/target/**</exclude>
<exclude>**/release.properties</exclude>
<exclude>**/*.releaseBackup</exclude>
<exclude>**/.classpath</exclude>
<exclude>**/.project</exclude>
<exclude>**/.settings/**</exclude>
<exclude>**/MANIFEST.MF</exclude>
<exclude>**/*.jar</exclude>
<exclude>**/.gitignore</exclude>
<exclude>**/epl-v100.html</exclude>
<exclude>**/README*</exclude>
<exclude>**/.svn/**</exclude>
<exclude>**/.git/**</exclude>
<exclude>**/*.git/**</exclude>
<exclude>**/archetype-resources/**</exclude>
<exclude>**/archetypes/**/goal.txt</exclude>
<exclude>**/coral/tests/**Resource*.java</exclude>
<exclude>**/ckpackager/src/orig/**</exclude>
</excludes>
</configuration>
</plugin>
</plugins>
</build>

<profiles>
Expand Down

0 comments on commit 70c6f0c

Please sign in to comment.