Merge branch 'master' of https://github.com/opensourceBIM/BIMserver.git

phxd88 · Jan 30, 2020 · 39f4fec · 39f4fec
2 parents d33ad3e + c502a3b
commit 39f4fec
Show file tree

Hide file tree

Showing 11 changed files with 54 additions and 55 deletions.
diff --git a/Bdb/pom.xml b/Bdb/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.opensourcebim</groupId>
 		<artifactId>parent</artifactId>
-		<version>1.5.181-SNAPSHOT</version>
+		<version>1.5.182-SNAPSHOT</version>
 	</parent>
 	<packaging>jar</packaging>
 	<name>Bdb</name>

diff --git a/BimServer/pom.xml b/BimServer/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.opensourcebim</groupId>
 		<artifactId>parent</artifactId>
-		<version>1.5.181-SNAPSHOT</version>
+		<version>1.5.182-SNAPSHOT</version>
 	</parent>
 	<build>
 		<sourceDirectory>src</sourceDirectory>
@@ -103,7 +103,7 @@
 		<dependency>
 			<groupId>org.opensourcebim</groupId>
 			<artifactId>bimserverclientlib</artifactId>
-			<version>1.5.181-SNAPSHOT</version>
+			<version>1.5.182-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>commons-collections</groupId>
@@ -189,7 +189,7 @@
 		<dependency>
 			<groupId>org.opensourcebim</groupId>
 			<artifactId>bdb</artifactId>
-			<version>1.5.181-SNAPSHOT</version>
+			<version>1.5.182-SNAPSHOT</version>
 		</dependency>
 	</dependencies>
 	<licenses>

diff --git a/BimServer/src/org/bimserver/BimServer.java b/BimServer/src/org/bimserver/BimServer.java
@@ -689,8 +689,7 @@ public void pluginBundleUninstalled(PluginBundle pluginBundle) {
 			if (!Files.exists(mavenPath)) {
 				Files.createDirectories(mavenPath);
 			}
-//			mavenPluginRepository = new MavenPluginRepository(mavenPath, "http://central.maven.org/maven2", "~/.m2/repository");
-
+
 			OldQuery.setPackageMetaDataForDefaultQuery(metaDataManager.getPackageMetaData("store"));
 
 			bimDatabase = new Database(this, packages, keyValueStore, metaDataManager);

diff --git a/BimServer/www/setup.html b/BimServer/www/setup.html
@@ -643,7 +643,7 @@ <h4 class="media-heading">Default mergers</h4>
 			cd.find(".plugins .maven input[type=\"checkbox\"]:checked").each(function(index, checkbox){
 				var artifactId = $(checkbox).attr("class");
 				pluginsToInstall[artifactId] = {
-					repository: "http://central.maven.org/maven2",
+					repository: "https://repo1.maven.org/maven2",
 					groupId: "org.opensourcebim",
 					artifactId: artifactId
 				};

diff --git a/BimServerClientLib/pom.xml b/BimServerClientLib/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.opensourcebim</groupId>
 		<artifactId>parent</artifactId>
-		<version>1.5.181-SNAPSHOT</version>
+		<version>1.5.182-SNAPSHOT</version>
 	</parent>
 	<properties>
 		<jetty.version>9.4.19.v20190610</jetty.version>

diff --git a/BimServerJar/pom.xml b/BimServerJar/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.opensourcebim</groupId>
 		<artifactId>parent</artifactId>
-		<version>1.5.181-SNAPSHOT</version>
+		<version>1.5.182-SNAPSHOT</version>
 	</parent>
 	<properties>
 		<jetty.version>9.4.19.v20190610</jetty.version>
@@ -67,7 +67,7 @@
 		<dependency>
 			<groupId>org.opensourcebim</groupId>
 			<artifactId>bimserver</artifactId>
-			<version>1.5.181-SNAPSHOT</version>
+			<version>1.5.182-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.eclipse.jetty</groupId>

diff --git a/BimServerWar/pom.xml b/BimServerWar/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.opensourcebim</groupId>
 		<artifactId>parent</artifactId>
-		<version>1.5.181-SNAPSHOT</version>
+		<version>1.5.182-SNAPSHOT</version>
 	</parent>
 	<build>
 		<sourceDirectory>src</sourceDirectory>
@@ -87,7 +87,7 @@
 		<dependency>
 			<groupId>org.opensourcebim</groupId>
 			<artifactId>bimserver</artifactId>
-			<version>1.5.181-SNAPSHOT</version>
+			<version>1.5.182-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>ch.qos.logback</groupId>

diff --git a/PluginBase/pom.xml b/PluginBase/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.opensourcebim</groupId>
 		<artifactId>parent</artifactId>
-		<version>1.5.181-SNAPSHOT</version>
+		<version>1.5.182-SNAPSHOT</version>
 	</parent>
 	<build>
 		<sourceDirectory>src</sourceDirectory>

diff --git a/PluginBase/src/org/bimserver/plugins/RemotePluginRepository.java b/PluginBase/src/org/bimserver/plugins/RemotePluginRepository.java
@@ -1,42 +1,42 @@
-package org.bimserver.plugins;
-
-/******************************************************************************
- * Copyright (C) 2009-2019  BIMserver.org
- * 
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- * 
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see {@literal<http://www.gnu.org/licenses/>}.
- *****************************************************************************/
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-import org.apache.maven.repository.internal.MavenRepositorySystemUtils;
-import org.eclipse.aether.DefaultRepositorySystemSession;
-import org.eclipse.aether.RepositorySystem;
-import org.eclipse.aether.RepositorySystemSession;
-import org.eclipse.aether.artifact.Artifact;
-import org.eclipse.aether.artifact.DefaultArtifact;
-import org.eclipse.aether.connector.basic.BasicRepositoryConnectorFactory;
-import org.eclipse.aether.impl.DefaultServiceLocator;
-import org.eclipse.aether.repository.LocalRepository;
-import org.eclipse.aether.repository.RemoteRepository;
-import org.eclipse.aether.resolution.ArtifactRequest;
-import org.eclipse.aether.resolution.ArtifactResolutionException;
-import org.eclipse.aether.resolution.ArtifactResult;
-import org.eclipse.aether.spi.connector.RepositoryConnectorFactory;
-import org.eclipse.aether.spi.connector.transport.TransporterFactory;
-import org.eclipse.aether.transport.file.FileTransporterFactory;
+package org.bimserver.plugins;
+
+/******************************************************************************
+ * Copyright (C) 2009-2019  BIMserver.org
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see {@literal<http://www.gnu.org/licenses/>}.
+ *****************************************************************************/
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+import org.apache.maven.repository.internal.MavenRepositorySystemUtils;
+import org.eclipse.aether.DefaultRepositorySystemSession;
+import org.eclipse.aether.RepositorySystem;
+import org.eclipse.aether.RepositorySystemSession;
+import org.eclipse.aether.artifact.Artifact;
+import org.eclipse.aether.artifact.DefaultArtifact;
+import org.eclipse.aether.connector.basic.BasicRepositoryConnectorFactory;
+import org.eclipse.aether.impl.DefaultServiceLocator;
+import org.eclipse.aether.repository.LocalRepository;
+import org.eclipse.aether.repository.RemoteRepository;
+import org.eclipse.aether.resolution.ArtifactRequest;
+import org.eclipse.aether.resolution.ArtifactResolutionException;
+import org.eclipse.aether.resolution.ArtifactResult;
+import org.eclipse.aether.spi.connector.RepositoryConnectorFactory;
+import org.eclipse.aether.spi.connector.transport.TransporterFactory;
+import org.eclipse.aether.transport.file.FileTransporterFactory;
 import org.eclipse.aether.transport.http.HttpTransporterFactory;
 
 public class RemotePluginRepository {
@@ -103,7 +103,7 @@ public static List<RemoteRepository> newRepositories(RepositorySystem system, Re
 	}
 
 	private static RemoteRepository newCentralRepository() {
-		return new RemoteRepository.Builder("central", "default", "http://central.maven.org/maven2/").build();
+		return new RemoteRepository.Builder("central", "default", "https://repo1.maven.org/maven2/").build();
 	}
 
 }
diff --git a/Shared/pom.xml b/Shared/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.opensourcebim</groupId>
 		<artifactId>parent</artifactId>
-		<version>1.5.181-SNAPSHOT</version>
+		<version>1.5.182-SNAPSHOT</version>
 	</parent>
 	<build>
 		<sourceDirectory>src</sourceDirectory>

diff --git a/pom.xml b/pom.xml
@@ -2,7 +2,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.opensourcebim</groupId>
 	<artifactId>parent</artifactId>
-	<version>1.5.181-SNAPSHOT</version>
+	<version>1.5.182-SNAPSHOT</version>
 	<packaging>pom</packaging>
 	<description>This is the parent pom, no idea why this is being released</description>
 	<properties>