You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by hb...@apache.org on 2018/05/21 21:30:26 UTC
[maven] branch MNG-6401-2 created (now 6dd92a8)
This is an automated email from the ASF dual-hosted git repository.
hboutemy pushed a change to branch MNG-6401-2
in repository https://gitbox.apache.org/repos/asf/maven.git.
at 6dd92a8 build with Java 8
This branch includes the following new commits:
new f709d5d [MNG-6401] Proxy.active & port to String to support interpolation
new 6dd92a8 build with Java 8
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
--
To stop receiving notification emails like this one, please contact
hboutemy@apache.org.
[maven] 02/02: build with Java 8
Posted by hb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
hboutemy pushed a commit to branch MNG-6401-2
in repository https://gitbox.apache.org/repos/asf/maven.git
commit 6dd92a8950781cabca6ddc9c4edbee906e9e7779
Author: Hervé Boutemy <hb...@apache.org>
AuthorDate: Mon May 21 23:29:50 2018 +0200
build with Java 8
---
Jenkinsfile | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index cda629e..464fecc 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -20,10 +20,10 @@
properties([buildDiscarder(logRotator(artifactNumToKeepStr: '5', numToKeepStr: env.BRANCH_NAME=='master'?'10':'5'))])
def buildOs = 'linux'
-def buildJdk = '7'
+def buildJdk = '8'
def buildMvn = '3.5.0'
def runITsOses = ['linux', 'windows']
-def runITsJdks = ['7', '8']
+def runITsJdks = ['7', '8', '9']
def runITsMvn = '3.5.0'
def runITscommand = "mvn clean install -Prun-its,embedded -B -U -V" // -DmavenDistro=... -Dmaven.test.failure.ignore=true
def tests
--
To stop receiving notification emails like this one, please contact
hboutemy@apache.org.
[maven] 01/02: [MNG-6401] Proxy.active & port to String to support
interpolation
Posted by hb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
hboutemy pushed a commit to branch MNG-6401-2
in repository https://gitbox.apache.org/repos/asf/maven.git
commit f709d5d20f306d6e0753c409da99b1b971c573ff
Author: Hervé Boutemy <hb...@apache.org>
AuthorDate: Mon May 21 23:29:15 2018 +0200
[MNG-6401] Proxy.active & port to String to support interpolation
---
maven-settings/src/main/mdo/settings.mdo | 43 ++++++++++++++++++++++++++++----
1 file changed, 38 insertions(+), 5 deletions(-)
diff --git a/maven-settings/src/main/mdo/settings.mdo b/maven-settings/src/main/mdo/settings.mdo
index 7547a9c..6be89a0 100644
--- a/maven-settings/src/main/mdo/settings.mdo
+++ b/maven-settings/src/main/mdo/settings.mdo
@@ -423,6 +423,9 @@
<description>
<![CDATA[
The <code><proxy></code> element contains informations required to a proxy settings.
+ Note: While the type
+ of this field is <code>String</code> for technical reasons, the semantic type is actually
+ <code>Boolean</code>. Default value is <code>true</code>.
]]></description>
<fields>
<field>
@@ -435,7 +438,7 @@
Whether this proxy configuration is the active one.
]]>
</description>
- <type>boolean</type>
+ <type>String</type>
</field>
<field>
<name>protocol</name>
@@ -468,15 +471,17 @@
</description>
<type>String</type>
</field>
- <field>
- <name>port</name>
+ <field xml.tagName="port">
+ <name>portString</name>
<version>1.0.0+</version>
<description>
<![CDATA[
- The proxy port.
+ The proxy port. Note: While the type
+ of this field is <code>String</code> for technical reasons, the semantic type is actually
+ <code>integer</code>.
]]>
</description>
- <type>int</type>
+ <type>String</type>
<defaultValue>8080</defaultValue>
</field>
<field>
@@ -501,6 +506,34 @@
<type>String</type>
</field>
</fields>
+ <codeSegments>
+ <codeSegment>
+ <version>1.0.0+</version>
+ <code>
+ <![CDATA[
+ public boolean isActive()
+ {
+ return ( active != null ) ? Boolean.parseBoolean( active ) : true;
+ }
+
+ public void setActive( boolean active )
+ {
+ this.active = String.valueOf( active );
+ }
+
+ public int getPort()
+ {
+ return ( portString != null ) ? Integer.parseInt( portString ) : 0;
+ }
+
+ public void setPort( int port )
+ {
+ this.portString = String.valueOf( port );
+ }
+ ]]>
+ </code>
+ </codeSegment>
+ </codeSegments>
</class>
<class>
<name>Server</name>
--
To stop receiving notification emails like this one, please contact
hboutemy@apache.org.