Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update Maven Model to 3.5.3 #12

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Update Maven Model to 3.5.3 #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6c2bcd5
Update Maven Model to 3.5.3
gastaldi Apr 3, 2018
45b4199
Junit and hamcrest as test scoped
gastaldi Apr 3, 2018
4f04aaa
Update toolchains model to 1.1.0
gastaldi Apr 4, 2018
71a4ade
commons-io isn't used at all
gastaldi Apr 4, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 16 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
.classpath
.project
.settings
.DS_Store
dependency-reduced-pom.xml
target/
*.iml
*.ipr
*.iws
*.swp
/*/src/main/java/META-INF
.gitignore.swp
.idea
.factorypath
.externalToolBuilders
/bin/
15 changes: 4 additions & 11 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
<properties>
<projectOwner>Apache Software Foundation</projectOwner>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<mavenVersion>3.0.3</mavenVersion>
<mavenVersion>3.5.3</mavenVersion>
</properties>

<dependencyManagement>
Expand Down Expand Up @@ -71,11 +71,6 @@
<artifactId>maven-core</artifactId>
<version>${mavenVersion}</version>
</dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>2.4</version>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
Expand Down Expand Up @@ -112,17 +107,15 @@
<groupId>org.apache.maven</groupId>
<artifactId>maven-core</artifactId>
</dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-core</artifactId>
<scope>test</scope>
</dependency>
</dependencies>

Expand Down Expand Up @@ -201,7 +194,7 @@
<goal>jdom-writer</goal>
</goals>
<configuration>
<version>1.0.0</version>
<version>1.1.0</version>
<models>
<model>target/dependency/apache-maven-${mavenVersion}/maven-core/src/main/mdo/toolchains.mdo</model>
</models>
Expand Down
3 changes: 2 additions & 1 deletion src/main/java/org/apache/maven/toolchain/model/io/jdom/MavenToolchainsJDOMWriter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
*/
package org.apache.maven.toolchain.model.io.jdom;

import static org.apache.maven.io.util.WriterUtils.findAndReplaceProperties;
import static org.apache.maven.io.util.WriterUtils.findAndReplaceSimpleElement;
import static org.apache.maven.io.util.WriterUtils.findAndReplaceXpp3DOM;

Expand Down Expand Up @@ -208,7 +209,7 @@ protected void updateToolchainModel( final ToolchainModel toolchainModel, final
final IndentationCounter innerCount = new IndentationCounter( counter.getDepth() + 1 );
findAndReplaceSimpleElement( innerCount, root, "type",
toolchainModel.getType() == null ? null : toolchainModel.getType(), null );
findAndReplaceXpp3DOM( innerCount, root, "provides", (Xpp3Dom) toolchainModel.getProvides() );
findAndReplaceProperties( innerCount, root, "provides", toolchainModel.getProvides() );
findAndReplaceXpp3DOM( innerCount, root, "configuration", (Xpp3Dom) toolchainModel.getConfiguration() );
} // -- void updateToolchainModel( ToolchainModel, String, Counter, Element )

Expand Down