You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sirona.apache.org by ol...@apache.org on 2015/01/21 13:32:17 UTC
svn commit: r1653500 - in /incubator/sirona/trunk: api/pom.xml core/pom.xml
pom.xml
Author: olamy
Date: Wed Jan 21 12:32:16 2015
New Revision: 1653500
URL: http://svn.apache.org/r1653500
Log:
1.5 is only for api and core
Modified:
incubator/sirona/trunk/api/pom.xml
incubator/sirona/trunk/core/pom.xml
incubator/sirona/trunk/pom.xml
Modified: incubator/sirona/trunk/api/pom.xml
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/api/pom.xml?rev=1653500&r1=1653499&r2=1653500&view=diff
==============================================================================
--- incubator/sirona/trunk/api/pom.xml (original)
+++ incubator/sirona/trunk/api/pom.xml Wed Jan 21 12:32:16 2015
@@ -30,4 +30,49 @@
<description>Contains some interfaces and classes of the Sirona Api</description>
+ <profiles>
+ <profile>
+ <id>jenkins-1.5</id>
+ <properties>
+ <maven.compiler.source>1.5</maven.compiler.source>
+ <maven.compiler.target>1.5</maven.compiler.target>
+ </properties>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-toolchains-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>toolchain</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <toolchains>
+ <jdk>
+ <version>1.5</version>
+ <vendor>sun</vendor>
+ </jdk>
+ </toolchains>
+ </configuration>
+ </plugin>
+ </plugins>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <fork>true</fork>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+
+ </build>
+ </profile>
+ </profiles>
+
</project>
Modified: incubator/sirona/trunk/core/pom.xml
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/core/pom.xml?rev=1653500&r1=1653499&r2=1653500&view=diff
==============================================================================
--- incubator/sirona/trunk/core/pom.xml (original)
+++ incubator/sirona/trunk/core/pom.xml Wed Jan 21 12:32:16 2015
@@ -47,4 +47,50 @@
<scope>test</scope>
</dependency>
</dependencies>
+
+ <profiles>
+ <profile>
+ <id>jenkins-1.5</id>
+ <properties>
+ <maven.compiler.source>1.5</maven.compiler.source>
+ <maven.compiler.target>1.5</maven.compiler.target>
+ </properties>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-toolchains-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>toolchain</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <toolchains>
+ <jdk>
+ <version>1.5</version>
+ <vendor>sun</vendor>
+ </jdk>
+ </toolchains>
+ </configuration>
+ </plugin>
+ </plugins>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <fork>true</fork>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+
+ </build>
+ </profile>
+ </profiles>
+
</project>
Modified: incubator/sirona/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/pom.xml?rev=1653500&r1=1653499&r2=1653500&view=diff
==============================================================================
--- incubator/sirona/trunk/pom.xml (original)
+++ incubator/sirona/trunk/pom.xml Wed Jan 21 12:32:16 2015
@@ -152,7 +152,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.17</version>
+ <version>2.18.1</version>
<configuration>
<systemPropertyVariables>
<java.awt.headless>true</java.awt.headless>
@@ -161,6 +161,11 @@
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-toolchains-plugin</artifactId>
+ <version>1.1</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
<version>3.3</version>
<dependencies>
@@ -576,50 +581,4 @@
</plugins>
</reporting>
- <profiles>
- <profile>
- <id>jenkins</id>
- <properties>
- <maven.compiler.source>1.5</maven.compiler.source>
- <maven.compiler.target>1.5</maven.compiler.target>
- </properties>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-toolchains-plugin</artifactId>
- <version>1.1</version>
- <executions>
- <execution>
- <goals>
- <goal>toolchain</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <toolchains>
- <jdk>
- <version>1.5</version>
- <vendor>sun</vendor>
- </jdk>
- </toolchains>
- </configuration>
- </plugin>
- </plugins>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <fork>true</fork>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
-
- </build>
- </profile>
- </profiles>
-
</project>