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.

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

[kie-issues#628] Update repositories and other small changes to Apache #5553

Merged
merged 2 commits into from
Oct 16, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
24 changes: 13 additions & 11 deletions bom/drools-bom/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,13 @@
<url>https://www.drools.org</url>

<scm>
<connection>scm:git:https://github.com/kiegroup/drools.git</connection>
<developerConnection>scm:git:git@github.com:kiegroup/drools.git</developerConnection>
<url>https://github.com/kiegroup/drools</url>
<connection>scm:git:https://github.com/apache/incubator-kie-drools.git</connection>
<developerConnection>scm:git:git@github.com:apache/incubator-kie-drools.git</developerConnection>
<url>https://github.com/apache/incubator-kie-drools</url>
</scm>
<issueManagement>
<system>jira</system>
<url>https://issues.jboss.org/browse/DROOLS</url>
<system>GitHub Issues</system>
<url>https://github.com/apache/incubator-kie-issues/issues</url>
</issueManagement>
<developers>
<developer>
Expand All @@ -44,7 +44,14 @@
</contributors>
<mailingLists>
<mailingList>
<name>setup</name>
<name>Development mailing list</name>
<post>dev@kie.apache.org</post>
<subscribe>dev-subscribe@kie.apache.org</subscribe>
<unsubscribe>dev-unsubscribe@kie.apache.org</unsubscribe>
<archive>https://lists.apache.org/list.html?dev@kie.apache.org</archive>
</mailingList>
<mailingList>
<name>Users</name>
<subscribe>https://groups.google.com/forum/#!forum/drools-setup</subscribe>
<unsubscribe>https://groups.google.com/forum/#!forum/drools-setup</unsubscribe>
<otherArchives>
Expand All @@ -57,11 +64,6 @@
<subscribe>https://groups.google.com/forum/#!forum/drools-usage</subscribe>
<unsubscribe>https://groups.google.com/forum/#!forum/drools-usage</unsubscribe>
</mailingList>
<mailingList>
<name>development</name>
<subscribe>https://groups.google.com/forum/#!forum/drools-development</subscribe>
<unsubscribe>https://groups.google.com/forum/#!forum/drools-development</unsubscribe>
</mailingList>
</mailingLists>

<!-- IMPORTANT: Do not declare any build things here! Declare them in kie-user-bom-parent. -->
Expand Down
74 changes: 2 additions & 72 deletions bom/kie-core-bom/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@
<url>http://www.kiegroup.org</url>
<inceptionYear>2001</inceptionYear>
<organization>
<name>JBoss by Red Hat</name>
<url>http://www.jboss.org/</url>
<name>The Apache Software Foundation</name>
<url>https://apache.org/</url>
</organization>

<licenses>
Expand All @@ -33,76 +33,6 @@
</license>
</licenses>

<properties>
<jboss.releases.repo.url>https://repository.jboss.org/nexus/service/local/staging/deploy/maven2/</jboss.releases.repo.url>
<jboss.snapshots.repo.url>https://repository.jboss.org/nexus/content/repositories/snapshots/</jboss.snapshots.repo.url>
</properties>

<repositories>
<!-- Having the <repositories> in this POM is an ugly hack to make sure we can always find
the jboss-integration-platform-parent (ip-parent). In most of the cases the ip-parent is available directly from
Maven Central. However, when new version gets released it takes up to 24 hours to get it synced into the Maven
Central. So in that period the local build of droolsjbpm-build-bootstrap would fail (unless one would
locally build the ip-parent from the sources as well, which is not something users should be doing). Configuring the
'repository.jboss.org' directly works around this issue. -->
<repository>
<!-- Duplicating the Maven Central repository here (as it is already coming from Super POM) makes the build much faster,
as the Maven Central is now treated as the first (default) repository (because it is before the JBoss.org one).
Artifacts with release (fixed) versions are being downloaded primarily from central. Without the central being the
first repository the JBoss.org Nexus would be contacted first and since it is quite slow it slows down the build.
We use JBoss.org repo only to download our SNAPSHOTs. -->
<id>central</id>
<name>Central Repository</name>
<url>https://repo.maven.apache.org/maven2</url>
<layout>default</layout>
<snapshots>
<enabled>false</enabled>
</snapshots>
</repository>
<!-- Bootstrap repository to locate the parent pom when the parent pom has not been build locally. -->
<!-- Conventions are described in http://community.jboss.org/wiki/MavenGettingStarted-Developers -->
<repository>
<id>jboss-public-repository-group</id>
<name>JBoss Public Repository Group</name>
<url>https://repository.jboss.org/nexus/content/groups/public/</url>
<releases>
<enabled>true</enabled>
<updatePolicy>never</updatePolicy>
</releases>
<snapshots>
<enabled>true</enabled>
<updatePolicy>daily</updatePolicy>
</snapshots>
</repository>
</repositories>
<pluginRepositories>
<pluginRepository>
<!-- Duplicating the Maven Central repository here (as it is already coming from Super POM) makes the build much faster,
as the Maven Central is now treated as the first (default) repository (because it is before the JBoss.org one).
Artifacts with release (fixed) versions are being downloaded primarily from there. Without the central being the
first repository the JBoss.org Nexus would be contacted first and since it is quite slow it slows down the build.
We use JBoss.org repo only to download our SNAPSHOTs. -->
<id>central</id>
<name>Central Repository</name>
<url>https://repo.maven.apache.org/maven2</url>
<layout>default</layout>
<snapshots>
<enabled>false</enabled>
</snapshots>
</pluginRepository>
<pluginRepository>
<id>jboss-public-repository-group</id>
<name>JBoss Public Repository Group</name>
<url>https://repository.jboss.org/nexus/content/groups/public/</url>
<releases>
<enabled>true</enabled>
</releases>
<snapshots>
<enabled>true</enabled>
</snapshots>
</pluginRepository>
</pluginRepositories>

<!-- IMPORTANT: Do not declare any build things here! Declare them in kie-user-bom-parent. -->
<build/>

Expand Down
22 changes: 12 additions & 10 deletions bom/kie-dmn-bom/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,13 @@
<url>https://www.drools.org</url>

<scm>
<connection>scm:git:https://github.com/kiegroup/drools.git</connection>
<developerConnection>scm:git:git@github.com:kiegroup/drools.git</developerConnection>
<url>https://github.com/kiegroup/drools</url>
<connection>scm:git:https://github.com/apache/incubator-kie-drools.git</connection>
<developerConnection>scm:git:git@github.com:apache/incubator-kie-drools.git</developerConnection>
<url>https://github.com/apache/incubator-kie-drools</url>
</scm>
<issueManagement>
<system>jira</system>
<url>https://issues.jboss.org/browse/DROOLS</url>
<system>GitHub Issues</system>
<url>https://github.com/apache/incubator-kie-issues/issues</url>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

mailing lists section below lacks the newly added entry.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed.

</issueManagement>
<developers>
<developer>
Expand All @@ -42,6 +42,13 @@
</contributor>
</contributors>
<mailingLists>
<mailingList>
<name>Development mailing list</name>
<post>dev@kie.apache.org</post>
<subscribe>dev-subscribe@kie.apache.org</subscribe>
<unsubscribe>dev-unsubscribe@kie.apache.org</unsubscribe>
<archive>https://lists.apache.org/list.html?dev@kie.apache.org</archive>
</mailingList>
<mailingList>
<name>setup</name>
<subscribe>https://groups.google.com/forum/#!forum/drools-setup</subscribe>
Expand All @@ -52,11 +59,6 @@
<subscribe>https://groups.google.com/forum/#!forum/drools-usage</subscribe>
<unsubscribe>https://groups.google.com/forum/#!forum/drools-usage</unsubscribe>
</mailingList>
<mailingList>
<name>development</name>
<subscribe>https://groups.google.com/forum/#!forum/drools-development</subscribe>
<unsubscribe>https://groups.google.com/forum/#!forum/drools-development</unsubscribe>
</mailingList>
</mailingLists>

<!-- IMPORTANT: Do not declare any build things here! Declare them in kie-user-bom-parent. -->
Expand Down
22 changes: 12 additions & 10 deletions bom/kie-efesto-bom/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,13 @@
<url>https://www.drools.org</url>

<scm>
<connection>scm:git:https://github.com/kiegroup/drools.git</connection>
<developerConnection>scm:git:git@github.com:kiegroup/drools.git</developerConnection>
<url>https://github.com/kiegroup/drools</url>
<connection>scm:git:https://github.com/apache/incubator-kie-drools.git</connection>
<developerConnection>scm:git:git@github.com:apache/incubator-kie-drools.git</developerConnection>
<url>https://github.com/apache/incubator-kie-drools</url>
</scm>
<issueManagement>
<system>jira</system>
<url>https://issues.jboss.org/browse/DROOLS</url>
<system>GitHub Issues</system>
<url>https://github.com/apache/incubator-kie-issues/issues</url>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

mailing lists section below lacks the newly added entry.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed.

</issueManagement>
<developers>
<developer>
Expand All @@ -42,6 +42,13 @@
</contributor>
</contributors>
<mailingLists>
<mailingList>
<name>Development mailing list</name>
<post>dev@kie.apache.org</post>
<subscribe>dev-subscribe@kie.apache.org</subscribe>
<unsubscribe>dev-unsubscribe@kie.apache.org</unsubscribe>
<archive>https://lists.apache.org/list.html?dev@kie.apache.org</archive>
</mailingList>
<mailingList>
<name>setup</name>
<subscribe>https://groups.google.com/forum/#!forum/drools-setup</subscribe>
Expand All @@ -52,11 +59,6 @@
<subscribe>https://groups.google.com/forum/#!forum/drools-usage</subscribe>
<unsubscribe>https://groups.google.com/forum/#!forum/drools-usage</unsubscribe>
</mailingList>
<mailingList>
<name>development</name>
<subscribe>https://groups.google.com/forum/#!forum/drools-development</subscribe>
<unsubscribe>https://groups.google.com/forum/#!forum/drools-development</unsubscribe>
</mailingList>
</mailingLists>

<!-- IMPORTANT: Do not declare any build things here! Declare them in kie-user-bom-parent. -->
Expand Down
22 changes: 12 additions & 10 deletions bom/kie-pmml-bom/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,13 @@
<url>https://www.drools.org</url>

<scm>
<connection>scm:git:https://github.com/kiegroup/drools.git</connection>
<developerConnection>scm:git:git@github.com:kiegroup/drools.git</developerConnection>
<url>https://github.com/kiegroup/drools</url>
<connection>scm:git:https://github.com/apache/incubator-kie-drools.git</connection>
<developerConnection>scm:git:git@github.com:apache/incubator-kie-drools.git</developerConnection>
<url>https://github.com/apache/incubator-kie-drools</url>
</scm>
<issueManagement>
<system>jira</system>
<url>https://issues.jboss.org/browse/DROOLS</url>
<system>GitHub Issues</system>
<url>https://github.com/apache/incubator-kie-issues/issues</url>
</issueManagement>
<developers>
<developer>
Expand All @@ -42,6 +42,13 @@
</contributor>
</contributors>
<mailingLists>
<mailingList>
<name>Development mailing list</name>
<post>dev@kie.apache.org</post>
<subscribe>dev-subscribe@kie.apache.org</subscribe>
<unsubscribe>dev-unsubscribe@kie.apache.org</unsubscribe>
<archive>https://lists.apache.org/list.html?dev@kie.apache.org</archive>
</mailingList>
<mailingList>
<name>setup</name>
<subscribe>https://groups.google.com/forum/#!forum/drools-setup</subscribe>
Expand All @@ -52,11 +59,6 @@
<subscribe>https://groups.google.com/forum/#!forum/drools-usage</subscribe>
<unsubscribe>https://groups.google.com/forum/#!forum/drools-usage</unsubscribe>
</mailingList>
<mailingList>
<name>development</name>
<subscribe>https://groups.google.com/forum/#!forum/drools-development</subscribe>
<unsubscribe>https://groups.google.com/forum/#!forum/drools-development</unsubscribe>
</mailingList>
</mailingLists>

<!-- IMPORTANT: Do not declare any build things here! Declare them in kie-user-bom-parent. -->
Expand Down
10 changes: 0 additions & 10 deletions build-parent/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -236,14 +236,6 @@

<dependencyManagement>
<dependencies>
<!-- dependencies from jboss-ip-bom -->
<!--
CONVENTIONS:
- Dependencies must be SORTED ALPHABETICALLY on groupId (other forms of sorting were found to be unclear and ambiguous).
- Do not declare <scope> (exception: import) or <optional>: a child module will declare scope/optional itself.
- Always extract the version as a property.
- A element's inner order is <groupId>, <artifactId>, [<type>,] [<classifier>,] <version> (following Aether proper)
-->
<!-- Keep in sync with groupId org.slf4j -->
<dependency>
<groupId>ch.qos.logback</groupId>
Expand Down Expand Up @@ -921,8 +913,6 @@
<version>${version.xmlunit}</version>
</dependency>

<!-- END of jboss-ip-bom -->

<!--JMH (Benchmarks)-->
<dependency>
<groupId>org.openjdk.jmh</groupId>
Expand Down
19 changes: 0 additions & 19 deletions drools-examples/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -39,25 +39,6 @@
<java.module.name>org.drools.examples.generic</java.module.name>
</properties>

<repositories>
<!-- TODO remove this once maven central replicates the jboss repository -->
<!-- Included so the examples sources in the distribution zip build out-of-the-box with maven -->
<repository>
<id>jboss-public-repository-group</id>
<name>JBoss Public Repository Group</name>
<url>https://repository.jboss.org/nexus/content/groups/public/</url>
<layout>default</layout>
<releases>
<enabled>true</enabled>
<updatePolicy>never</updatePolicy>
</releases>
<snapshots>
<enabled>true</enabled>
<updatePolicy>daily</updatePolicy>
</snapshots>
</repository>
</repositories>

<build>
<plugins>

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<PMML version="4.2" xsi:schemaLocation="http://www.dmg.org/PMML-4_2 http://www.dmg.org/v4-2-1/pmml-4-2.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.dmg.org/PMML-4_2">
<Header copyright="JBoss"/>
<Header copyright="Apache"/>
<DataDictionary numberOfFields="5">
<DataField dataType="double" name="fld1" optype="continuous"/>
<DataField dataType="double" name="fld2" optype="continuous"/>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,20 +1,21 @@
<?xml version="1.0" encoding="UTF-8"?>

<!--
~ Copyright 2016 JBoss Inc
~
~ Licensed 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.
-->
<!--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.-->

<xs:schema elementFormDefault="qualified" targetNamespace="http://test/"
xmlns="http://test/" xmlns:xs="http://www.w3.org/2001/XMLSchema">
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
/* JBoss Drools Verifier Style Sheet */
/* Website: http://labs.jboss.com/jbossrules/ */

ul,p,table
{
padding:0px 0px 0px 20px;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<PMML version="4.2" xsi:schemaLocation="http://www.dmg.org/PMML-4_2 http://www.dmg.org/v4-2-1/pmml-4-2.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.dmg.org/PMML-4_2">
<Header copyright="JBoss"/>
<Header copyright="Apache"/>
<DataDictionary numberOfFields="5">
<DataField dataType="double" name="fld1" optype="continuous"/>
<DataField dataType="double" name="fld2" optype="continuous"/>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<PMML version="4.2" xsi:schemaLocation="http://www.dmg.org/PMML-4_2 http://www.dmg.org/v4-2-1/pmml-4-2.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.dmg.org/PMML-4_2">
<Header copyright="JBoss"/>
<Header copyright="Apache"/>
<DataDictionary numberOfFields="4">
<DataField dataType="double" name="fld1" optype="continuous"/>
<DataField dataType="double" name="fld2" optype="continuous"/>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<PMML xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="4.2" xsi:schemaLocation="http://www.dmg.org/PMML-4_2 http://www.dmg.org/v4-2-1/pmml-4-2.xsd" xmlns="http://www.dmg.org/PMML-4_2">
<Header copyright="JBoss"/>
<Header copyright="Apache"/>
<DataDictionary numberOfFields="5">
<DataField dataType="double" name="fld1" optype="continuous"/>
<DataField dataType="double" name="fld2" optype="continuous"/>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<PMML xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="4.2" xsi:schemaLocation="http://www.dmg.org/PMML-4_2 http://www.dmg.org/v4-2-1/pmml-4-2.xsd" xmlns="http://www.dmg.org/PMML-4_2">
<Header copyright="JBoss"/>
<Header copyright="Apache"/>
<DataDictionary numberOfFields="4">
<DataField dataType="double" name="fld1" optype="continuous"/>
<DataField dataType="double" name="fld2" optype="continuous"/>
Expand Down
Loading
Loading