Merge remote-tracking branch 'origin/develop' into develop

jcryptool · Aug 18, 2018 · 175aef6 · 175aef6
2 parents a29d59e + f99f848
commit 175aef6
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 27 deletions.
diff --git a/org.jcryptool.releng/pom.xml b/org.jcryptool.releng/pom.xml
@@ -48,35 +48,15 @@ Maven 3 and Java 8 are required for the build. See https://github.com/jcryptool/
 			<url>http://download.eclipse.org/releases/photon</url>
 		</repository>
 		<repository>
-			<id>eclipse-babel-oxygen</id>
+			<id>eclipse-babel-photon</id>
 			<layout>p2</layout>
-			<url>http://download.eclipse.org/technology/babel/update-site/R0.15.1/oxygen</url>
+			<url>http://download.eclipse.org/technology/babel/update-site/R0.16.0/photon</url>
 		</repository>
 	</repositories>
 
 	<build>
 		<defaultGoal>clean package</defaultGoal>
 		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-enforcer-plugin</artifactId>
-				<version>1.4.1</version>
-				<executions>
-					<execution>
-						<id>enforce-maven</id>
-						<goals>
-							<goal>enforce</goal>
-						</goals>
-						<configuration>
-							<rules>
-								<requireMavenVersion>
-									<version>3.0</version>
-								</requireMavenVersion>
-							</rules>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
 			<plugin>
 				<groupId>org.eclipse.tycho</groupId>
 				<artifactId>tycho-maven-plugin</artifactId>
@@ -233,7 +213,7 @@ Maven 3 and Java 8 are required for the build. See https://github.com/jcryptool/
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-project-info-reports-plugin</artifactId>
-				<version>2.9</version>
+				<version>3.0.0</version>
 			</plugin>
 		</plugins>
 	</reporting>

diff --git a/org.jcryptool.target/org.jcryptool.target.target b/org.jcryptool.target/org.jcryptool.target.target
@@ -1,9 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?><?pde version="3.8"?><target name="JCrypTool RCP" sequenceNumber="41">
 <locations>
-<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="false" type="InstallableUnit">
-<unit id="org.eclipse.babel.nls_eclipse_de.feature.group" version="4.7.0.v20171231020002"/>
-<repository location="http://download.eclipse.org/technology/babel/update-site/R0.15.1/oxygen"/>
-</location>
 	<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="false" type="InstallableUnit">
 		<unit id="org.eclipse.equinox.core.sdk.feature.group" version="3.14.0.v20180512-1130"/>
 		<unit id="org.eclipse.equinox.p2.sdk.feature.group" version="3.11.0.v20180515-1348"/>
@@ -14,6 +10,10 @@
 		<unit id="org.eclipse.zest.sdk.feature.group" version="1.7.0.201606061308"/>
 		<repository location="http://download.eclipse.org/releases/photon"/>
 	</location>
+	<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="false" type="InstallableUnit">
+		<unit id="org.eclipse.babel.nls_eclipse_de.feature.group" version="4.8.0.v20180815020001"/>
+		<repository location="http://download.eclipse.org/technology/babel/update-site/R0.16.0/photon/"/>
+	</location>
 </locations>
 <launcherArgs>
 <vmArgs>-Xms40m -Xmx512m</vmArgs>