inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-07-31 17:39:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

change back alfresco-maven-plugin

Browse Source 
comment out thejava version from the maven-enforcer-plugin
This commit is contained in:
Rodica Sutu
2019-03-28 09:48:45 +02:00
parent a891f75568
commit 8c70dbce5b
2 changed files with 31 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
pom.xml
View File

@@ -480,7 +480,7 @@
<maven.build.sourceVersion>1.8</maven.build.sourceVersion> <maven.build.sourceVersion>1.8</maven.build.sourceVersion>
<maven.build.testSourceVersion>1.8</maven.build.testSourceVersion> <maven.build.testSourceVersion>1.8</maven.build.testSourceVersion>
<maven.buildhelper.version>1.9.1</maven.buildhelper.version> <maven.buildhelper.version>1.9.1</maven.buildhelper.version>
<maven.compiler.version>3.2</maven.compiler.version> <maven.compiler.version>3.8.0</maven.compiler.version>
<maven.enforcer.plugin>1.4</maven.enforcer.plugin> <maven.enforcer.plugin>1.4</maven.enforcer.plugin>
<maven.resources.version>2.7</maven.resources.version> <maven.resources.version>2.7</maven.resources.version>
<maven.tomcat.port>8080</maven.tomcat.port> <maven.tomcat.port>8080</maven.tomcat.port>
@@ -574,11 +574,12 @@
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <!--<dependency>-->
<groupId>com.sun.xml.bind</groupId> <!--<groupId>com.sun.xml.bind</groupId>-->
<artifactId>jaxb-core</artifactId> <!--<artifactId>jaxb-core</artifactId>-->
<version>${javax-jaxb.version}</version> <!--<version>${javax-jaxb.version}</version>-->
</dependency> <!--<scope>provided</scope>-->
<!--</dependency>-->
<dependency> <dependency>
<groupId>org.apache.bcel</groupId> <groupId>org.apache.bcel</groupId>
@@ -591,25 +592,25 @@
<build> <build>
<finalName>${project.artifactId}-${project.version}</finalName> <finalName>${project.artifactId}-${project.version}</finalName>
<plugins> <plugins>
<plugin> <!--<plugin>-->
<artifactId>maven-enforcer-plugin</artifactId> <!--<artifactId>maven-enforcer-plugin</artifactId>-->
<version>1.4</version> <!--<version>1.4</version>-->
<executions> <!--<executions>-->
<execution> <!--<execution>-->
<id>enforce-java</id> <!--<id>enforce-java</id>-->
<goals> <!--<goals>-->
<goal>enforce</goal> <!--<goal>enforce</goal>-->
</goals> <!--</goals>-->
<configuration> <!--<configuration>-->
<rules> <!--<rules>-->
<requireJavaVersion> <!--<requireJavaVersion>-->
<version>1.8</version> <!--<version>1.8</version>-->
</requireJavaVersion> <!--</requireJavaVersion>-->
</rules> <!--</rules>-->
</configuration> <!--</configuration>-->
</execution> <!--</execution>-->
</executions> <!--</executions>-->
</plugin> <!--</plugin>-->
<plugin> <plugin>
<groupId>org.codehaus.mojo</groupId> <groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId> <artifactId>build-helper-maven-plugin</artifactId>
@@ -830,7 +831,7 @@
<plugin> <plugin>
<groupId>org.alfresco.maven.plugin</groupId> <groupId>org.alfresco.maven.plugin</groupId>
<artifactId>alfresco-maven-plugin</artifactId> <artifactId>alfresco-maven-plugin</artifactId>
<version>2.2.0</version> <version>2.1.1</version>
<extensions>true</extensions> <extensions>true</extensions>
<configuration> <configuration>
<snapshotToTimestamp>true</snapshotToTimestamp> <snapshotToTimestamp>true</snapshotToTimestamp>
@@ -1046,7 +1047,7 @@
<dependency> <dependency>
<groupId>org.alfresco.maven.plugin</groupId> <groupId>org.alfresco.maven.plugin</groupId>
<artifactId>alfresco-maven-plugin</artifactId> <artifactId>alfresco-maven-plugin</artifactId>
<version>2.2.0</version> <version>2.1.1</version>
</dependency> </dependency>
</dependencies> </dependencies>
<configuration> <configuration>

4
rm-community/rm-community-repo/pom.xml
View File

@@ -265,7 +265,9 @@
<attachClasses>true</attachClasses> <attachClasses>true</attachClasses>
<attachConfig>true</attachConfig> <attachConfig>true</attachConfig>
<includeDependencies>true</includeDependencies> <includeDependencies>true</includeDependencies>
<ampBuildDirectory>${project.build.directory}/${project.build.finalName}</ampBuildDirectory> <!--<ampBuildDirectory>${project.build.directory}/${project.build.finalName}</ampBuildDirectory>-->
<!--<ampFinalDir>${project.build.directory}/${project.build.finalName}</ampFinalDir>-->
</configuration> </configuration>
</execution> </execution>
<execution> <execution>