XCOMMONS-3043: os.* system properties should be transmitted to Maven

Author: tmortagne

xwiki-commons-core/xwiki-commons-extension/xwiki-commons-extension-repositories/xwiki-commons-extension-repository-maven/src/main/java/org/xwiki/extension/repository/aether/internal/XWikiRepositorySystemSession.java

@@ -62,7 +62,7 @@ public class XWikiRepositorySystemSession extends AbstractForwardingRepositorySy
 {
     static final JreProxySelector JREPROXYSELECTOR = new JreProxySelector();
 
-    private static final Set<String> SYSTEM_PROPERTIES = Set.of("java.version");
+    private static final Set<String> SYSTEM_PROPERTIES = Set.of("java.version", "os.name", "os.arch", "os.version");
 
     @Inject
     private MavenArtifactHandlerManager standardHandlers;

xwiki-commons-core/xwiki-commons-extension/xwiki-commons-extension-repositories/xwiki-commons-extension-repository-maven/src/test/java/org/xwiki/extension/repository/aether/internal/AetherDefaultRepositoryManagerTest.java

@@ -615,6 +615,15 @@ public void testResolveDependencyFromUnknownRepository() throws ResolveException
         assertEquals(dependency.getId(), dependencyExtension.getId().getId());
     }
 
+    @Test
+    public void testResolveWithProfileActivation() throws ResolveException
+    {
+        Extension extension = this.repositoryManager.resolve(new ExtensionId("groupid:profileactivation", "version"));
+
+        assertEquals("javapropertyvalue", extension.getProperty("xwiki.extension.javaproperty"));
+        assertEquals("ospropertyvalue", extension.getProperty("xwiki.extension.osproperty"));
+    }
+
     // Failures
 
     @Test(expected = ExtensionNotFoundException.class)

xwiki-commons-core/xwiki-commons-extension/xwiki-commons-extension-repositories/xwiki-commons-extension-repository-maven/src/test/resources/repository/maven/groupid/profileactivation/version/profileactivation-version.pom

@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ * See the NOTICE file distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software 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
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+-->
+
+<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/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>groupid</groupId>
+  <artifactId>profileactivation</artifactId>
+  <version>version</version>
+  <packaging>type</packaging>
+  <profiles>
+    <profile>
+      <id>javaversion</id>
+      <activation>
+       <jdk>[1.8,)</jdk>
+     </activation>
+      <properties>
+        <xwiki.extension.javaproperty>javapropertyvalue</xwiki.extension.javaproperty>
+      </properties>
+    </profile>
+    <profile>
+      <id>osfamilly</id>
+      <activation>
+        <os>
+          <family>!noos</family>
+        </os>
+      </activation>
+      <properties>
+        <xwiki.extension.osproperty>ospropertyvalue</xwiki.extension.osproperty>
+      </properties>
+    </profile>
+  </profiles>
+</project>