Skip to content

Commit

Permalink
Added dependencyManagement in parent pom
Browse files Browse the repository at this point in the history
  • Loading branch information
chkal committed May 19, 2021
1 parent 0d9d674 commit 5bb64ed
Show file tree
Hide file tree
Showing 15 changed files with 74 additions and 54 deletions.
8 changes: 1 addition & 7 deletions core/pom.xml
Expand Up @@ -2,7 +2,7 @@
<!--
Copyright (c) 2014-2015 Oracle and/or its affiliates. All rights reserved.
Copyright (c) 2018, 2019 Eclipse Krazo committers and contributors
Copyright (c) 2018, 2021 Eclipse Krazo committers and contributors
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -116,37 +116,31 @@
<dependency>
<groupId>jakarta.mvc</groupId>
<artifactId>jakarta.mvc-api</artifactId>
<version>${spec.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>jakarta.ws.rs</groupId>
<artifactId>jakarta.ws.rs-api</artifactId>
<version>3.0.0</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>jakarta.servlet</groupId>
<artifactId>jakarta.servlet-api</artifactId>
<version>5.0.0</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>jakarta.enterprise</groupId>
<artifactId>jakarta.enterprise.cdi-api</artifactId>
<version>3.0.0</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>jakarta.validation</groupId>
<artifactId>jakarta.validation-api</artifactId>
<version>3.0.0</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>jakarta.annotation</groupId>
<artifactId>jakarta.annotation-api</artifactId>
<version>2.0.0</version>
<scope>provided</scope>
</dependency>

Expand Down
4 changes: 2 additions & 2 deletions examples/csrf-property/pom.xml
Expand Up @@ -2,7 +2,7 @@
<!--
Copyright (c) 2014-2015 Oracle and/or its affiliates. All rights reserved.
Copyright (c) 2018, 2019 Eclipse Krazo committers and contributors
Copyright (c) 2018, 2021 Eclipse Krazo committers and contributors
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -36,7 +36,7 @@
<dependency>
<groupId>org.eclipse.krazo</groupId>
<artifactId>krazo-core</artifactId>
<version>3.0.0-SNAPSHOT</version>
<version>${project.version}</version>
</dependency>
</dependencies>
</project>
4 changes: 2 additions & 2 deletions examples/def-ext/pom.xml
Expand Up @@ -2,7 +2,7 @@
<!--
Copyright (c) 2014-2015 Oracle and/or its affiliates. All rights reserved.
Copyright (c) 2018, 2019 Eclipse Krazo committers and contributors
Copyright (c) 2018, 2021 Eclipse Krazo committers and contributors
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -36,7 +36,7 @@
<dependency>
<groupId>org.eclipse.krazo</groupId>
<artifactId>krazo-core</artifactId>
<version>3.0.0-SNAPSHOT</version>
<version>${project.version}</version>
</dependency>
</dependencies>
</project>
4 changes: 2 additions & 2 deletions examples/exceptions/pom.xml
Expand Up @@ -2,7 +2,7 @@
<!--
Copyright (c) 2014-2015 Oracle and/or its affiliates. All rights reserved.
Copyright (c) 2018, 2019 Eclipse Krazo committers and contributors
Copyright (c) 2018, 2021 Eclipse Krazo committers and contributors
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -36,7 +36,7 @@
<dependency>
<groupId>org.eclipse.krazo</groupId>
<artifactId>krazo-core</artifactId>
<version>3.0.0-SNAPSHOT</version>
<version>${project.version}</version>
</dependency>
</dependencies>
</project>
5 changes: 1 addition & 4 deletions examples/pom.xml
Expand Up @@ -2,7 +2,7 @@
<!--
Copyright (c) 2014-2015 Oracle and/or its affiliates. All rights reserved.
Copyright (c) 2018, 2019 Eclipse Krazo committers and contributors
Copyright (c) 2018, 2021 Eclipse Krazo committers and contributors
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -37,7 +37,6 @@
<dependency>
<groupId>jakarta.platform</groupId>
<artifactId>jakarta.jakartaee-api</artifactId>
<version>${jakartaee.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
Expand Down Expand Up @@ -88,7 +87,6 @@
<dependency>
<groupId>jakarta.mvc</groupId>
<artifactId>jakarta.mvc-api</artifactId>
<version>${spec.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
Expand All @@ -111,7 +109,6 @@
<dependency>
<groupId>jakarta.mvc</groupId>
<artifactId>jakarta.mvc-api</artifactId>
<version>${spec.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
Expand Down
4 changes: 2 additions & 2 deletions examples/redirectScope2/pom.xml
Expand Up @@ -2,7 +2,7 @@
<!--
Copyright (c) 2014-2015 Oracle and/or its affiliates. All rights reserved.
Copyright (c) 2018, 2019 Eclipse Krazo committers and contributors
Copyright (c) 2018, 2021 Eclipse Krazo committers and contributors
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -36,7 +36,7 @@
<dependency>
<groupId>org.eclipse.krazo</groupId>
<artifactId>krazo-core</artifactId>
<version>3.0.0-SNAPSHOT</version>
<version>${project.version}</version>
</dependency>
</dependencies>
</project>
4 changes: 2 additions & 2 deletions examples/redirectScope3/pom.xml
Expand Up @@ -2,7 +2,7 @@
<!--
Copyright (c) 2014-2015 Oracle and/or its affiliates. All rights reserved.
Copyright (c) 2018, 2019 Eclipse Krazo committers and contributors
Copyright (c) 2018, 2021 Eclipse Krazo committers and contributors
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -36,7 +36,7 @@
<dependency>
<groupId>org.eclipse.krazo</groupId>
<artifactId>krazo-core</artifactId>
<version>3.0.0-SNAPSHOT</version>
<version>${project.version}</version>
</dependency>
</dependencies>
</project>
7 changes: 1 addition & 6 deletions examples/uri-builder/pom.xml
Expand Up @@ -2,7 +2,7 @@
<!--
Copyright (c) 2014-2015 Oracle and/or its affiliates. All rights reserved.
Copyright (c) 2018, 2019 Eclipse Krazo committers and contributors
Copyright (c) 2018, 2021 Eclipse Krazo committers and contributors
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -34,9 +34,4 @@
<build>
<finalName>${project.artifactId}</finalName>
</build>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
</properties>
</project>
3 changes: 1 addition & 2 deletions examples/validation-i18n/pom.xml
Expand Up @@ -2,7 +2,7 @@
<!--
Copyright (c) 2014-2015 Oracle and/or its affiliates. All rights reserved.
Copyright (c) 2018, 2019 Eclipse Krazo committers and contributors
Copyright (c) 2018, 2021 Eclipse Krazo committers and contributors
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -47,7 +47,6 @@
<dependency>
<groupId>jakarta.servlet.jsp.jstl</groupId>
<artifactId>jakarta.servlet.jsp.jstl-api</artifactId>
<version>1.2.7</version>
<scope>provided</scope>
</dependency>
</dependencies>
Expand Down
4 changes: 1 addition & 3 deletions ext/pom.xml
Expand Up @@ -2,7 +2,7 @@
<!--
Copyright (c) 2014-2015 Oracle and/or its affiliates. All rights reserved.
Copyright (c) 2018, 2019 Eclipse Krazo committers and contributors
Copyright (c) 2018, 2021 Eclipse Krazo committers and contributors
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -54,13 +54,11 @@
<dependency>
<groupId>jakarta.platform</groupId>
<artifactId>jakarta.jakartaee-api</artifactId>
<version>9.0.0</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>jakarta.mvc</groupId>
<artifactId>jakarta.mvc-api</artifactId>
<version>${spec.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
Expand Down
5 changes: 1 addition & 4 deletions jersey/pom.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright (c) 2018, 2019 Eclipse Krazo committers and contributors
Copyright (c) 2018, 2021 Eclipse Krazo committers and contributors
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -86,13 +86,11 @@
<dependency>
<groupId>jakarta.mvc</groupId>
<artifactId>jakarta.mvc-api</artifactId>
<version>${spec.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>jakarta.servlet</groupId>
<artifactId>jakarta.servlet-api</artifactId>
<version>5.0.0</version>
<scope>provided</scope>
</dependency>

Expand All @@ -101,7 +99,6 @@
<groupId>org.eclipse.krazo</groupId>
<artifactId>krazo-core</artifactId>
<version>${project.version}</version>
<scope>compile</scope>
</dependency>

<!-- Jersey -->
Expand Down
53 changes: 51 additions & 2 deletions pom.xml
@@ -1,7 +1,7 @@
<!--
Copyright (c) 2014-2015 Oracle and/or its affiliates. All rights reserved.
Copyright (c) 2018, 2019 Eclipse Krazo committers and contributors
Copyright (c) 2018, 2021 Eclipse Krazo committers and contributors
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -48,7 +48,6 @@

<spec.version>2.0.0</spec.version>
<jersey.version>3.0.0</jersey.version>
<jakartaee.version>9.0.0</jakartaee.version>

</properties>

Expand Down Expand Up @@ -234,6 +233,56 @@
</plugins>
</build>

<dependencyManagement>
<dependencies>

<!-- Jakarta MVC API -->
<dependency>
<groupId>jakarta.mvc</groupId>
<artifactId>jakarta.mvc-api</artifactId>
<version>${spec.version}</version>
</dependency>

<!-- Other Jakarta specifications -->
<dependency>
<groupId>jakarta.platform</groupId>
<artifactId>jakarta.jakartaee-api</artifactId>
<version>9.0.0</version>
</dependency>
<dependency>
<groupId>jakarta.ws.rs</groupId>
<artifactId>jakarta.ws.rs-api</artifactId>
<version>3.0.0</version>
</dependency>
<dependency>
<groupId>jakarta.servlet</groupId>
<artifactId>jakarta.servlet-api</artifactId>
<version>5.0.0</version>
</dependency>
<dependency>
<groupId>jakarta.enterprise</groupId>
<artifactId>jakarta.enterprise.cdi-api</artifactId>
<version>3.0.0</version>
</dependency>
<dependency>
<groupId>jakarta.validation</groupId>
<artifactId>jakarta.validation-api</artifactId>
<version>3.0.0</version>
</dependency>
<dependency>
<groupId>jakarta.annotation</groupId>
<artifactId>jakarta.annotation-api</artifactId>
<version>2.0.0</version>
</dependency>
<dependency>
<groupId>jakarta.servlet.jsp.jstl</groupId>
<artifactId>jakarta.servlet.jsp.jstl-api</artifactId>
<version>2.0.0</version>
</dependency>

</dependencies>
</dependencyManagement>

<profiles>
<profile>
<id>release</id>
Expand Down
17 changes: 6 additions & 11 deletions resteasy/pom.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright (c) 2018, 2019 Eclipse Krazo committers and contributors
Copyright (c) 2018, 2021 Eclipse Krazo committers and contributors
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -78,19 +78,21 @@
<dependency>
<groupId>jakarta.mvc</groupId>
<artifactId>jakarta.mvc-api</artifactId>
<version>${spec.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>jakarta.ws.rs</groupId>
<artifactId>jakarta.ws.rs-api</artifactId>
<version>3.0.0</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>jakarta.servlet</groupId>
<artifactId>jakarta.servlet-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>jakarta.annotation</groupId>
<artifactId>jakarta.annotation-api</artifactId>
<version>2.0.0</version>
<scope>provided</scope>
</dependency>

Expand All @@ -99,7 +101,6 @@
<groupId>org.eclipse.krazo</groupId>
<artifactId>krazo-core</artifactId>
<version>${project.version}</version>
<scope>compile</scope>
</dependency>

<!-- RESTEasy -->
Expand All @@ -115,12 +116,6 @@
<version>3.6.1.SP8</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>jakarta.servlet</groupId>
<artifactId>jakarta.servlet-api</artifactId>
<version>5.0.0</version>
<scope>provided</scope>
</dependency>

</dependencies>

Expand Down

0 comments on commit 5bb64ed

Please sign in to comment.