-
Notifications
You must be signed in to change notification settings - Fork 69
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
11 changed files
with
685 additions
and
1 deletion.
There are no files selected for viewing
75 changes: 75 additions & 0 deletions
75
core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7836AlternativePomSyntaxTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,75 @@ | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one | ||
| * or more contributor license agreements. See the NOTICE file | ||
| * distributed with this work for additional information | ||
| * regarding copyright ownership. The ASF licenses this file | ||
| * to you under the Apache License, Version 2.0 (the | ||
| * "License"); you may not use this file except in compliance | ||
| * with the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, | ||
| * software distributed under the License is distributed on an | ||
| * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| * KIND, either express or implied. See the License for the | ||
| * specific language governing permissions and limitations | ||
| * under the License. | ||
| */ | ||
| package org.apache.maven.it; | ||
|
|
||
| import java.io.File; | ||
| import java.nio.charset.StandardCharsets; | ||
| import java.nio.file.Files; | ||
| import java.nio.file.Path; | ||
| import java.nio.file.Paths; | ||
| import java.util.List; | ||
|
|
||
| import org.apache.maven.shared.verifier.Verifier; | ||
| import org.apache.maven.shared.verifier.util.ResourceExtractor; | ||
| import org.junit.jupiter.api.Test; | ||
|
|
||
| class MavenITmng7836AlternativePomSyntaxTest extends AbstractMavenIntegrationTestCase { | ||
|
|
||
| protected MavenITmng7836AlternativePomSyntaxTest() { | ||
| // New feature in alpha-8-SNAPSHOT | ||
| super("(4.0.0-alpha-7,)"); | ||
| } | ||
|
|
||
| @Test | ||
| void testAlternativeSyntax() throws Exception { | ||
| File testDir = ResourceExtractor.simpleExtractResources(getClass(), "/mng-7836-alternative-pom-syntax"); | ||
|
|
||
| final Verifier pluginVerifier = newVerifier(new File(testDir, "maven-hocon-extension").getPath()); | ||
| pluginVerifier.addCliArgument("clean"); | ||
| pluginVerifier.addCliArgument("install"); | ||
| pluginVerifier.addCliArgument("-V"); | ||
| pluginVerifier.execute(); | ||
| pluginVerifier.verifyErrorFreeLog(); | ||
|
|
||
| final Verifier consumerVerifier = newVerifier(new File(testDir, "simple").getPath()); | ||
| consumerVerifier.addCliArgument("clean"); | ||
| consumerVerifier.addCliArgument("install"); | ||
| consumerVerifier.addCliArgument("-Drat.skip=true"); | ||
| consumerVerifier.addCliArgument("-V"); | ||
|
|
||
| Path consumerPom = Paths.get(consumerVerifier.getArtifactPath( | ||
| "org.apache.maven.its.mng-7836", "hocon-simple", "1.0.0-SNAPSHOT", "pom", "")); | ||
| Path buildPom = Paths.get(consumerVerifier.getArtifactPath( | ||
| "org.apache.maven.its.mng-7836", "hocon-simple", "1.0.0-SNAPSHOT", "pom", "build")); | ||
| consumerVerifier.deleteArtifacts("org.apache.maven.its.mng-7836", "hocon-simple", "1.0.0-SNAPSHOT"); | ||
|
|
||
| consumerVerifier.execute(); | ||
| consumerVerifier.verifyErrorFreeLog(); | ||
|
|
||
| assertTrue(Files.isRegularFile(consumerPom)); | ||
| List<String> consumerPomLines = Files.readAllLines(consumerPom, StandardCharsets.UTF_8); | ||
| assertTrue(consumerPomLines.stream().anyMatch(l -> l.contains("<name>Apache-2.0</name>"))); | ||
| assertFalse(consumerPomLines.stream().anyMatch(l -> l.contains("<parent>"))); | ||
|
|
||
| // The build pom is the original POM, so the hocon file | ||
| assertTrue(Files.isRegularFile(buildPom)); | ||
| List<String> buildPomLines = Files.readAllLines(buildPom, StandardCharsets.UTF_8); | ||
| assertTrue(buildPomLines.stream().anyMatch(l -> l.contains("groupId = org.apache.maven.extensions"))); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
143 changes: 143 additions & 0 deletions
143
...it-suite/src/test/resources/mng-7836-alternative-pom-syntax/maven-hocon-extension/pom.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,143 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <!-- | ||
| Licensed to the Apache Software Foundation (ASF) under one | ||
| or more contributor license agreements. See the NOTICE file | ||
| distributed with this work for additional information | ||
| regarding copyright ownership. The ASF licenses this file | ||
| to you under the Apache License, Version 2.0 (the | ||
| "License"); you may not use this file except in compliance | ||
| with the License. You may obtain a copy of the License at | ||
| http://www.apache.org/licenses/LICENSE-2.0 | ||
| Unless required by applicable law or agreed to in writing, | ||
| software distributed under the License is distributed on an | ||
| "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| KIND, either express or implied. See the License for the | ||
| specific language governing permissions and limitations | ||
| under the License. | ||
| --> | ||
| <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 https://maven.apache.org/xsd/maven-4.0.0.xsd"> | ||
| <modelVersion>4.0.0</modelVersion> | ||
|
|
||
| <groupId>org.apache.maven.its.mng-7836</groupId> | ||
| <artifactId>maven-hocon-extension</artifactId> | ||
| <version>1.0.0-SNAPSHOT</version> | ||
| <packaging>jar</packaging> | ||
|
|
||
| <properties> | ||
| <javaVersion>8</javaVersion> | ||
| <maven.compiler.source>${javaVersion}</maven.compiler.source> | ||
| <maven.compiler.target>${javaVersion}</maven.compiler.target> | ||
| </properties> | ||
|
|
||
| <dependencies> | ||
| <dependency> | ||
| <groupId>org.apache.maven</groupId> | ||
| <artifactId>maven-api-spi</artifactId> | ||
| <version>4.0.0-alpha-8-SNAPSHOT</version> | ||
| <scope>provided</scope> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>org.apache.maven</groupId> | ||
| <artifactId>maven-api-core</artifactId> | ||
| <version>4.0.0-alpha-8-SNAPSHOT</version> | ||
| <scope>provided</scope> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>com.typesafe</groupId> | ||
| <artifactId>config</artifactId> | ||
| <version>1.4.2</version> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>javax.inject</groupId> | ||
| <artifactId>javax.inject</artifactId> | ||
| <version>1</version> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>javax.annotation</groupId> | ||
| <artifactId>javax.annotation-api</artifactId> | ||
| <version>1.3.2</version> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>org.junit.jupiter</groupId> | ||
| <artifactId>junit-jupiter</artifactId> | ||
| <version>5.9.1</version> | ||
| <scope>test</scope> | ||
| </dependency> | ||
| </dependencies> | ||
|
|
||
| <build> | ||
| <plugins> | ||
| <plugin> | ||
| <groupId>org.apache.maven.plugins</groupId> | ||
| <artifactId>maven-dependency-plugin</artifactId> | ||
| <version>3.3.0</version> | ||
| <executions> | ||
| <execution> | ||
| <id>copy-mdo</id> | ||
| <goals> | ||
| <goal>copy</goal> | ||
| </goals> | ||
| <phase>generate-sources</phase> | ||
| <configuration> | ||
| <artifactItems> | ||
| <artifactItem> | ||
| <groupId>org.apache.maven</groupId> | ||
| <artifactId>maven-api-model</artifactId> | ||
| <version>4.0.0-alpha-8-SNAPSHOT</version> | ||
| <type>mdo</type> | ||
| </artifactItem> | ||
| </artifactItems> | ||
| </configuration> | ||
| </execution> | ||
| </executions> | ||
| </plugin> | ||
| <plugin> | ||
| <groupId>org.codehaus.modello</groupId> | ||
| <artifactId>modello-maven-plugin</artifactId> | ||
| <version>2.1.1</version> | ||
| <executions> | ||
| <execution> | ||
| <id>generate-hocon-reader</id> | ||
| <goals> | ||
| <goal>velocity</goal> | ||
| </goals> | ||
| <phase>generate-sources</phase> | ||
| <configuration> | ||
| <version>4.2.0</version> | ||
| <models> | ||
| <model>target/dependency/maven-api-model-4.0.0-alpha-8-SNAPSHOT.mdo</model> | ||
| </models> | ||
| <templates> | ||
| <template>src/mdo/hocon-reader.vm</template> | ||
| </templates> | ||
| <params> | ||
| <param>packageModelV4=org.apache.maven.api.model</param> | ||
| </params> | ||
| </configuration> | ||
| </execution> | ||
| </executions> | ||
| </plugin> | ||
| <plugin> | ||
| <groupId>org.eclipse.sisu</groupId> | ||
| <artifactId>sisu-maven-plugin</artifactId> | ||
| <version>0.3.5</version> | ||
| <executions> | ||
| <execution> | ||
| <id>index-project</id> | ||
| <goals> | ||
| <goal>main-index</goal> | ||
| </goals> | ||
| </execution> | ||
| </executions> | ||
| </plugin> | ||
| <plugin> | ||
| <groupId>org.apache.maven.plugins</groupId> | ||
| <artifactId>maven-surefire-plugin</artifactId> | ||
| <version>3.0.0-M7</version> | ||
| </plugin> | ||
| </plugins> | ||
| </build> | ||
|
|
||
| </project> |
64 changes: 64 additions & 0 deletions
64
...m-syntax/maven-hocon-extension/src/main/java/org/apache/maven/hocon/HoconModelReader.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,64 @@ | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one | ||
| * or more contributor license agreements. See the NOTICE file | ||
| * distributed with this work for additional information | ||
| * regarding copyright ownership. The ASF licenses this file | ||
| * to you under the Apache License, Version 2.0 (the | ||
| * "License"); you may not use this file except in compliance | ||
| * with the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, | ||
| * software distributed under the License is distributed on an | ||
| * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| * KIND, either express or implied. See the License for the | ||
| * specific language governing permissions and limitations | ||
| * under the License. | ||
| */ | ||
| package org.apache.maven.hocon; | ||
|
|
||
| import javax.annotation.Priority; | ||
| import javax.inject.Named; | ||
|
|
||
| import java.io.IOException; | ||
| import java.io.InputStream; | ||
| import java.io.InputStreamReader; | ||
| import java.nio.charset.StandardCharsets; | ||
| import java.nio.file.Files; | ||
| import java.nio.file.Path; | ||
| import java.util.Map; | ||
| import java.util.Optional; | ||
|
|
||
| import com.typesafe.config.Config; | ||
| import com.typesafe.config.ConfigFactory; | ||
| import org.apache.maven.api.model.Model; | ||
| import org.apache.maven.api.services.Source; | ||
| import org.apache.maven.api.spi.ModelParser; | ||
| import org.apache.maven.api.spi.ModelParserException; | ||
|
|
||
| @Named("hocon") | ||
| @Priority(1) | ||
| public class HoconModelReader implements ModelParser { | ||
|
|
||
| @Override | ||
| public Optional<Source> locate(Path path) { | ||
| Path pom = Files.isDirectory(path) ? path.resolve("pom.hocon") : path; | ||
| return Files.isRegularFile(pom) ? Optional.of(new PathSource(pom)) : Optional.empty(); | ||
| } | ||
|
|
||
| @Override | ||
| public Model parse(Source source, Map<String, ?> map) throws ModelParserException { | ||
| Config config; | ||
| if (source.getPath() != null) { | ||
| config = ConfigFactory.parseFile(source.getPath().toFile()); | ||
| } else { | ||
| try (InputStream input = source.openStream()) { | ||
| config = ConfigFactory.parseReader(new InputStreamReader(input, StandardCharsets.UTF_8)); | ||
| } catch (IOException e) { | ||
| throw new ModelParserException("Unable to parse: " + source.getLocation(), e); | ||
| } | ||
| } | ||
| return new HoconReader().parseModel(config.root()); | ||
| } | ||
| } |
51 changes: 51 additions & 0 deletions
51
...ive-pom-syntax/maven-hocon-extension/src/main/java/org/apache/maven/hocon/PathSource.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,51 @@ | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one | ||
| * or more contributor license agreements. See the NOTICE file | ||
| * distributed with this work for additional information | ||
| * regarding copyright ownership. The ASF licenses this file | ||
| * to you under the Apache License, Version 2.0 (the | ||
| * "License"); you may not use this file except in compliance | ||
| * with the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, | ||
| * software distributed under the License is distributed on an | ||
| * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| * KIND, either express or implied. See the License for the | ||
| * specific language governing permissions and limitations | ||
| * under the License. | ||
| */ | ||
| package org.apache.maven.hocon; | ||
|
|
||
| import java.io.IOException; | ||
| import java.io.InputStream; | ||
| import java.nio.file.Files; | ||
| import java.nio.file.Path; | ||
| import java.util.Objects; | ||
|
|
||
| import org.apache.maven.api.services.Source; | ||
|
|
||
| public class PathSource implements Source { | ||
|
|
||
| private final Path path; | ||
|
|
||
| public PathSource(Path path) { | ||
| this.path = Objects.requireNonNull(path); | ||
| } | ||
|
|
||
| @Override | ||
| public Path getPath() { | ||
| return path; | ||
| } | ||
|
|
||
| @Override | ||
| public InputStream openStream() throws IOException { | ||
| return Files.newInputStream(path); | ||
| } | ||
|
|
||
| @Override | ||
| public String getLocation() { | ||
| return path.toString(); | ||
| } | ||
| } |
Oops, something went wrong.